diff options
author | Jan Kotas <jkotas@microsoft.com> | 2016-10-03 23:44:06 +0300 |
---|---|---|
committer | Jan Kotas <jkotas@microsoft.com> | 2016-10-05 03:32:33 +0300 |
commit | 3f907c1cfebea121c18f5e0748e8ad6c55987297 (patch) | |
tree | b85dfa722523a57b8cecaa395b3830d978627b1b | |
parent | b24644ce4117b1c94fca165b7513a44bf576ca13 (diff) |
Bump System.Runtime.WindowsRuntime, System.Threading and System.Diagnostics.Debug default to .NETStandard,Version=v1.7
6 files changed, 10 insertions, 19 deletions
diff --git a/src/System.Diagnostics.Debug/src/System.Diagnostics.Debug.csproj b/src/System.Diagnostics.Debug/src/System.Diagnostics.Debug.csproj index 80cdf036cb..a4f82dde32 100644 --- a/src/System.Diagnostics.Debug/src/System.Diagnostics.Debug.csproj +++ b/src/System.Diagnostics.Debug/src/System.Diagnostics.Debug.csproj @@ -11,8 +11,7 @@ <!-- Suppress warnings for type conflicts between SafeFileHandle in partial facade and mscorlib --> <NoWarn>0436</NoWarn> <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' != ''">None</ResourcesSourceOutputDirectory> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker> - <PackageTargetFramework Condition="'$(TargetGroup)' == '' AND '$(TargetsWindows)' == 'true'">netstandard1.3;netcore50</PackageTargetFramework> + <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <PropertyGroup Condition=" '$(TargetsUnix)' == 'true' "> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> diff --git a/src/System.Diagnostics.Debug/src/project.json b/src/System.Diagnostics.Debug/src/project.json index 1b700b915d..ac186ce12f 100644 --- a/src/System.Diagnostics.Debug/src/project.json +++ b/src/System.Diagnostics.Debug/src/project.json @@ -1,12 +1,9 @@ { "frameworks": { - "netstandard1.3": { + "netstandard1.7": { "dependencies": { "Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24603-02" - }, - "imports": [ - "dotnet5.4" - ] + } }, "netcore50": { "dependencies": { diff --git a/src/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj b/src/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj index 3e6a7ded49..54e1d31d8c 100644 --- a/src/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj +++ b/src/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj @@ -14,7 +14,7 @@ <ProjectGuid>{844A2A0B-4169-49C3-B367-AFDC4894E487}</ProjectGuid> <PackageTargetRuntime>win8</PackageTargetRuntime> <PackageTargetRuntime Condition="'$(TargetGroup)' == 'netcore50aot'">win8-aot</PackageTargetRuntime> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker> + <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <PropertyGroup Condition="'$(TargetGroup)'==''"> <DefineConstants>$(DefineConstants);netstandard;FEATURE_APPX</DefineConstants> @@ -40,9 +40,8 @@ <ProjectReference Include="..\..\System.Runtime.InteropServices.WindowsRuntime\src\System.Runtime.InteropServices.WindowsRuntime.csproj"> <UndefineProperties>OSGroup</UndefineProperties> </ProjectReference> - <!-- ensure we use the lower-versioned UWP compatible facades so that this facade is compatible with UWP --> - <ProjectReference Include="..\..\System.ObjectModel\src\redist\System.ObjectModel.depproj"> - <TargetGroup>netcore50</TargetGroup> + <ProjectReference Include="..\..\System.ObjectModel\src\System.ObjectModel.csproj"> + <UndefineProperties>OSGroup</UndefineProperties> </ProjectReference> <Compile Include="System\IO\StreamOperationAsyncResult.CoreCLR.cs" /> <Compile Include="System\Runtime\InteropServices\WindowsRuntime\MarshalingHelpers.cs" /> diff --git a/src/System.Runtime.WindowsRuntime/src/project.json b/src/System.Runtime.WindowsRuntime/src/project.json index e6883ae486..e69d7c1b03 100644 --- a/src/System.Runtime.WindowsRuntime/src/project.json +++ b/src/System.Runtime.WindowsRuntime/src/project.json @@ -1,6 +1,6 @@ { "frameworks": { - "netstandard1.3": { + "netstandard1.7": { "dependencies": { "Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24603-02", "Microsoft.TargetingPack.Private.WinRT": "1.0.1" diff --git a/src/System.Threading/src/System.Threading.csproj b/src/System.Threading/src/System.Threading.csproj index 228486d424..ba3714457c 100644 --- a/src/System.Threading/src/System.Threading.csproj +++ b/src/System.Threading/src/System.Threading.csproj @@ -7,8 +7,7 @@ <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' != ''">None</ResourcesSourceOutputDirectory> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker> - <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.3;netcore50</PackageTargetFramework> + <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> diff --git a/src/System.Threading/src/project.json b/src/System.Threading/src/project.json index f38127ac9a..ff23644795 100644 --- a/src/System.Threading/src/project.json +++ b/src/System.Threading/src/project.json @@ -1,12 +1,9 @@ { "frameworks": { - "netstandard1.3": { + "netstandard1.7": { "dependencies": { "Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24603-02" - }, - "imports": [ - "dotnet5.4" - ] + } }, "netcore50": { "dependencies": { |