Browse Source

Fix usage of MSBuild.Sdk.Extras and target UAP10.0 instead of a specific uap version.

Updated UniversalWindowsPlatform to 6.2.6
pull/513/head
Yitzchok Gottlieb 6 years ago
parent
commit
30eabcd4ea
  1. 24
      NAudio/NAudio.csproj
  2. 4
      global.json

24
NAudio/NAudio.csproj

@ -1,7 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net35;uap10.0.10240</TargetFrameworks>
<TargetFrameworks>net35;netstandard2.0;uap10.0</TargetFrameworks>
<Version>1.9.0</Version>
<Authors>Mark Heath &amp; Contributors</Authors>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@ -15,6 +14,10 @@
<GenerateDocumentationFile Condition=" '$(Configuration)' == 'Release' ">true</GenerateDocumentationFile>
</PropertyGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net35' ">
<Reference Include="System.Windows.Forms" />
<Compile Remove="Wave\WaveOutputs\WasapiOutRT.cs" />
@ -22,10 +25,6 @@
<Compile Remove="Wave\WaveOutputs\WaveFileWriterRT.cs" />
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
<Compile Remove="Utils\ProgressLog*.*" />
<Compile Remove="Gui\*.*" />
@ -41,7 +40,9 @@
<Compile Remove="Wave\WaveOutputs\WaveFileWriterRT.cs" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'uap10.0.10240' ">
<ItemGroup Condition=" '$(TargetFramework)' == 'uap10.0' ">
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.8" />
<Compile Remove="Utils\ProgressLog*.*" />
<Compile Remove="Gui\*.*" />
<Compile Remove="Wave\Compression\*.cs" />
@ -74,11 +75,4 @@
<Compile Remove="Dmo\Effect\*.cs" />
<Compile Remove="Wave\WaveProviders\DmoEffectWaveProvider.cs" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'uap10.0' or '$(TargetFramework)' == 'uap10.0.10240'">
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.0.8" />
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.5.4" PrivateAssets="All" />
</ItemGroup>
<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
</Project>

4
global.json

@ -1,5 +1,5 @@
{
"sdk": {
"version": "2.1.500"
"msbuild-sdks": {
"MSBuild.Sdk.Extras": "2.0.31"
}
}
Loading…
Cancel
Save