Skip to content
This repository was archived by the owner on Apr 20, 2023. It is now read-only.

Commit 8f7b58d

Browse files
jeffkljeffkl
authored
Move some projects to netstandard2.0 (#8692)
* Move some projects to netstandard2.0 * Use version agnostic $(TargetFrameworkIdentifier) property to make changing versions easier since we only care about .NET Framework vs .NET Standard * Add missing project to solution file * Update TestPackageProjects.targets to use netstandard2.0 on non-Windows
1 parent b64df31 commit 8f7b58d

File tree

14 files changed

+85
-51
lines changed

14 files changed

+85
-51
lines changed

‎Microsoft.DotNet.Cli.sln‎

Lines changed: 55 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
Microsoft Visual Studio Solution File, Format Version 12.00
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
23
# Visual Studio 15
34
VisualStudioVersion = 15.0.27130.2020
45
MinimumVisualStudioVersion = 10.0.40219.1
@@ -236,7 +237,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Tools.Test
236237
EndProject
237238
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "tool_launcher", "src\tool_launcher\tool_launcher.csproj", "{EDF19BE6-F20F-4AD0-8E3B-E837030726A5}"
238239
EndProject
239-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-install-tool.Tests", "test\dotnet-install-tool.Tests\dotnet-install-tool.Tests.csproj", "{8FE9D802-57F3-493B-9E14-72DF905E3838}"
240+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-install-tool.Tests", "test\dotnet-install-tool.Tests\dotnet-install-tool.Tests.csproj", "{8FE9D802-57F3-493B-9E14-72DF905E3838}"
241+
EndProject
242+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.MSBuildSdkResolver.Tests", "test\Microsoft.DotNet.MSBuildSdkResolver.Tests\Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj", "{B7C82980-F01D-4B8A-A746-BFA0032CB152}"
240243
EndProject
241244
Global
242245
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -1646,30 +1649,6 @@ Global
16461649
{91BFE800-1624-4A58-A1CE-339705A8FFD0}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
16471650
{91BFE800-1624-4A58-A1CE-339705A8FFD0}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU
16481651
{91BFE800-1624-4A58-A1CE-339705A8FFD0}.RelWithDebInfo|x86.Build.0 = Release|Any CPU
1649-
{EDF19BE6-F20F-4AD0-8E3B-E837030726A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1650-
{EDF19BE6-F20F-4AD0-8E3B-E837030726A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
1651-
{EDF19BE6-F20F-4AD0-8E3B-E837030726A5}.Debug|x64.ActiveCfg = Debug|Any CPU
1652-
{EDF19BE6-F20F-4AD0-8E3B-E837030726A5}.Debug|x64.Build.0 = Debug|Any CPU
1653-
{EDF19BE6-F20F-4AD0-8E3B-E837030726A5}.Debug|x86.ActiveCfg = Debug|Any CPU
1654-
{EDF19BE6-F20F-4AD0-8E3B-E837030726A5}.Debug|x86.Build.0 = Debug|Any CPU
1655-
{EDF19BE6-F20F-4AD0-8E3B-E837030726A5}.MinSizeRel|Any CPU.ActiveCfg = Release|Any CPU
1656-
{EDF19BE6-F20F-4AD0-8E3B-E837030726A5}.MinSizeRel|Any CPU.Build.0 = Release|Any CPU
1657-
{EDF19BE6-F20F-4AD0-8E3B-E837030726A5}.MinSizeRel|x64.ActiveCfg = Release|Any CPU
1658-
{EDF19BE6-F20F-4AD0-8E3B-E837030726A5}.MinSizeRel|x64.Build.0 = Release|Any CPU
1659-
{EDF19BE6-F20F-4AD0-8E3B-E837030726A5}.MinSizeRel|x86.ActiveCfg = Release|Any CPU
1660-
{EDF19BE6-F20F-4AD0-8E3B-E837030726A5}.MinSizeRel|x86.Build.0 = Release|Any CPU
1661-
{EDF19BE6-F20F-4AD0-8E3B-E837030726A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
1662-
{EDF19BE6-F20F-4AD0-8E3B-E837030726A5}.Release|Any CPU.Build.0 = Release|Any CPU
1663-
{EDF19BE6-F20F-4AD0-8E3B-E837030726A5}.Release|x64.ActiveCfg = Release|Any CPU
1664-
{EDF19BE6-F20F-4AD0-8E3B-E837030726A5}.Release|x64.Build.0 = Release|Any CPU
1665-
{EDF19BE6-F20F-4AD0-8E3B-E837030726A5}.Release|x86.ActiveCfg = Release|Any CPU
1666-
{EDF19BE6-F20F-4AD0-8E3B-E837030726A5}.Release|x86.Build.0 = Release|Any CPU
1667-
{EDF19BE6-F20F-4AD0-8E3B-E837030726A5}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU
1668-
{EDF19BE6-F20F-4AD0-8E3B-E837030726A5}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
1669-
{EDF19BE6-F20F-4AD0-8E3B-E837030726A5}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
1670-
{EDF19BE6-F20F-4AD0-8E3B-E837030726A5}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
1671-
{EDF19BE6-F20F-4AD0-8E3B-E837030726A5}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU
1672-
{EDF19BE6-F20F-4AD0-8E3B-E837030726A5}.RelWithDebInfo|x86.Build.0 = Release|Any CPU
16731652
{E442F4C1-08DB-470F-B9A6-197444CD0295}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
16741653
{E442F4C1-08DB-470F-B9A6-197444CD0295}.Debug|Any CPU.Build.0 = Debug|Any CPU
16751654
{E442F4C1-08DB-470F-B9A6-197444CD0295}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -1694,6 +1673,30 @@ Global
16941673
{E442F4C1-08DB-470F-B9A6-197444CD0295}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
16951674
{E442F4C1-08DB-470F-B9A6-197444CD0295}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU
16961675
{E442F4C1-08DB-470F-B9A6-197444CD0295}.RelWithDebInfo|x86.Build.0 = Release|Any CPU
1676+
{EDF19BE6-F20F-4AD0-8E3B-E837030726A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1677+
{EDF19BE6-F20F-4AD0-8E3B-E837030726A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
1678+
{EDF19BE6-F20F-4AD0-8E3B-E837030726A5}.Debug|x64.ActiveCfg = Debug|Any CPU
1679+
{EDF19BE6-F20F-4AD0-8E3B-E837030726A5}.Debug|x64.Build.0 = Debug|Any CPU
1680+
{EDF19BE6-F20F-4AD0-8E3B-E837030726A5}.Debug|x86.ActiveCfg = Debug|Any CPU
1681+
{EDF19BE6-F20F-4AD0-8E3B-E837030726A5}.Debug|x86.Build.0 = Debug|Any CPU
1682+
{EDF19BE6-F20F-4AD0-8E3B-E837030726A5}.MinSizeRel|Any CPU.ActiveCfg = Release|Any CPU
1683+
{EDF19BE6-F20F-4AD0-8E3B-E837030726A5}.MinSizeRel|Any CPU.Build.0 = Release|Any CPU
1684+
{EDF19BE6-F20F-4AD0-8E3B-E837030726A5}.MinSizeRel|x64.ActiveCfg = Release|Any CPU
1685+
{EDF19BE6-F20F-4AD0-8E3B-E837030726A5}.MinSizeRel|x64.Build.0 = Release|Any CPU
1686+
{EDF19BE6-F20F-4AD0-8E3B-E837030726A5}.MinSizeRel|x86.ActiveCfg = Release|Any CPU
1687+
{EDF19BE6-F20F-4AD0-8E3B-E837030726A5}.MinSizeRel|x86.Build.0 = Release|Any CPU
1688+
{EDF19BE6-F20F-4AD0-8E3B-E837030726A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
1689+
{EDF19BE6-F20F-4AD0-8E3B-E837030726A5}.Release|Any CPU.Build.0 = Release|Any CPU
1690+
{EDF19BE6-F20F-4AD0-8E3B-E837030726A5}.Release|x64.ActiveCfg = Release|Any CPU
1691+
{EDF19BE6-F20F-4AD0-8E3B-E837030726A5}.Release|x64.Build.0 = Release|Any CPU
1692+
{EDF19BE6-F20F-4AD0-8E3B-E837030726A5}.Release|x86.ActiveCfg = Release|Any CPU
1693+
{EDF19BE6-F20F-4AD0-8E3B-E837030726A5}.Release|x86.Build.0 = Release|Any CPU
1694+
{EDF19BE6-F20F-4AD0-8E3B-E837030726A5}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU
1695+
{EDF19BE6-F20F-4AD0-8E3B-E837030726A5}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
1696+
{EDF19BE6-F20F-4AD0-8E3B-E837030726A5}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
1697+
{EDF19BE6-F20F-4AD0-8E3B-E837030726A5}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
1698+
{EDF19BE6-F20F-4AD0-8E3B-E837030726A5}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU
1699+
{EDF19BE6-F20F-4AD0-8E3B-E837030726A5}.RelWithDebInfo|x86.Build.0 = Release|Any CPU
16971700
{8FE9D802-57F3-493B-9E14-72DF905E3838}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
16981701
{8FE9D802-57F3-493B-9E14-72DF905E3838}.Debug|Any CPU.Build.0 = Debug|Any CPU
16991702
{8FE9D802-57F3-493B-9E14-72DF905E3838}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -1718,6 +1721,30 @@ Global
17181721
{8FE9D802-57F3-493B-9E14-72DF905E3838}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
17191722
{8FE9D802-57F3-493B-9E14-72DF905E3838}.RelWithDebInfo|x86.ActiveCfg = Debug|Any CPU
17201723
{8FE9D802-57F3-493B-9E14-72DF905E3838}.RelWithDebInfo|x86.Build.0 = Debug|Any CPU
1724+
{B7C82980-F01D-4B8A-A746-BFA0032CB152}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1725+
{B7C82980-F01D-4B8A-A746-BFA0032CB152}.Debug|Any CPU.Build.0 = Debug|Any CPU
1726+
{B7C82980-F01D-4B8A-A746-BFA0032CB152}.Debug|x64.ActiveCfg = Debug|Any CPU
1727+
{B7C82980-F01D-4B8A-A746-BFA0032CB152}.Debug|x64.Build.0 = Debug|Any CPU
1728+
{B7C82980-F01D-4B8A-A746-BFA0032CB152}.Debug|x86.ActiveCfg = Debug|Any CPU
1729+
{B7C82980-F01D-4B8A-A746-BFA0032CB152}.Debug|x86.Build.0 = Debug|Any CPU
1730+
{B7C82980-F01D-4B8A-A746-BFA0032CB152}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU
1731+
{B7C82980-F01D-4B8A-A746-BFA0032CB152}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU
1732+
{B7C82980-F01D-4B8A-A746-BFA0032CB152}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
1733+
{B7C82980-F01D-4B8A-A746-BFA0032CB152}.MinSizeRel|x64.Build.0 = Debug|Any CPU
1734+
{B7C82980-F01D-4B8A-A746-BFA0032CB152}.MinSizeRel|x86.ActiveCfg = Debug|Any CPU
1735+
{B7C82980-F01D-4B8A-A746-BFA0032CB152}.MinSizeRel|x86.Build.0 = Debug|Any CPU
1736+
{B7C82980-F01D-4B8A-A746-BFA0032CB152}.Release|Any CPU.ActiveCfg = Release|Any CPU
1737+
{B7C82980-F01D-4B8A-A746-BFA0032CB152}.Release|Any CPU.Build.0 = Release|Any CPU
1738+
{B7C82980-F01D-4B8A-A746-BFA0032CB152}.Release|x64.ActiveCfg = Release|Any CPU
1739+
{B7C82980-F01D-4B8A-A746-BFA0032CB152}.Release|x64.Build.0 = Release|Any CPU
1740+
{B7C82980-F01D-4B8A-A746-BFA0032CB152}.Release|x86.ActiveCfg = Release|Any CPU
1741+
{B7C82980-F01D-4B8A-A746-BFA0032CB152}.Release|x86.Build.0 = Release|Any CPU
1742+
{B7C82980-F01D-4B8A-A746-BFA0032CB152}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU
1743+
{B7C82980-F01D-4B8A-A746-BFA0032CB152}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
1744+
{B7C82980-F01D-4B8A-A746-BFA0032CB152}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
1745+
{B7C82980-F01D-4B8A-A746-BFA0032CB152}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
1746+
{B7C82980-F01D-4B8A-A746-BFA0032CB152}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU
1747+
{B7C82980-F01D-4B8A-A746-BFA0032CB152}.RelWithDebInfo|x86.Build.0 = Release|Any CPU
17211748
EndGlobalSection
17221749
GlobalSection(SolutionProperties) = preSolution
17231750
HideSolutionNode = FALSE
@@ -1791,9 +1818,10 @@ Global
17911818
{E7C72EF2-8480-48B4-AAE8-A596F1A6048E} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
17921819
{E84C08C9-70D7-48B0-9507-ADB8B9A2694C} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
17931820
{91BFE800-1624-4A58-A1CE-339705A8FFD0} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
1794-
{EDF19BE6-F20F-4AD0-8E3B-E837030726A5} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
17951821
{E442F4C1-08DB-470F-B9A6-197444CD0295} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
1822+
{EDF19BE6-F20F-4AD0-8E3B-E837030726A5} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
17961823
{8FE9D802-57F3-493B-9E14-72DF905E3838} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
1824+
{B7C82980-F01D-4B8A-A746-BFA0032CB152} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
17971825
EndGlobalSection
17981826
GlobalSection(ExtensibilityGlobals) = postSolution
17991827
SolutionGuid = {B526D2CE-EE2D-4AD4-93EF-1867D90FF1F5}

‎build/test/TestPackageProjects.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
4040
<VersionSuffix>$(VersionSuffix)</VersionSuffix>
4141
<Clean>False</Clean>
42-
<MsbuildArgs>/p:TargetFramework=netstandard1.5</MsbuildArgs>
42+
<MsbuildArgs>/p:TargetFramework=netstandard2.0</MsbuildArgs>
4343
</BaseTestPackageProject>
4444
<BaseTestPackageProject Include="src/Microsoft.DotNet.InternalAbstractions">
4545
<Name>Microsoft.DotNet.InternalAbstractions</Name>

‎src/Microsoft.DotNet.Cli.Sln.Internal/Microsoft.DotNet.Cli.Sln.Internal.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<Description>SLN file reader/writer</Description>
55
<VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
6-
<TargetFramework>netstandard1.6</TargetFramework>
6+
<TargetFramework>netstandard2.0</TargetFramework>
77
<DebugType>portable</DebugType>
88
<AssemblyName>Microsoft.DotNet.Cli.Sln.Internal</AssemblyName>
99
<AssemblyOriginatorKeyFile>../../tools/Key.snk</AssemblyOriginatorKeyFile>
@@ -22,7 +22,7 @@
2222
<ItemGroup>
2323
<PackageReference Include="System.Collections.Specialized" Version="4.0.1" />
2424
<PackageReference Include="System.Text.RegularExpressions" Version="4.1.0" />
25-
<PackageReference Include="NETStandard.Library" Version="1.6.0" />
25+
<PackageReference Include="NETStandard.Library" Version="2.0.0" />
2626
<PackageReference Include="XliffTasks" Version="$(XliffTasksPackageVersion)" PrivateAssets="All" />
2727
</ItemGroup>
2828
</Project>

‎src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
<PropertyGroup>
44
<Version>$(SdkVersion)</Version>
5-
<TargetFrameworks>netstandard1.5;net46</TargetFrameworks>
6-
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netstandard1.5</TargetFrameworks>
5+
<TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
6+
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netstandard2.0</TargetFrameworks>
77
<WarningsAsErrors>true</WarningsAsErrors>
88
<AssemblyOriginatorKeyFile>../../tools/Key.snk</AssemblyOriginatorKeyFile>
99
<SignAssembly>true</SignAssembly>
@@ -27,11 +27,12 @@
2727
<PackageReference Include="XliffTasks" Version="$(XliffTasksPackageVersion)" PrivateAssets="All" />
2828
</ItemGroup>
2929

30-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
30+
<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETStandard' ">
31+
<PackageReference Include="NETStandard.Library" Version="2.0.0" />
3132
<PackageReference Include="System.Diagnostics.Process" Version="4.1.0" />
3233
</ItemGroup>
3334

34-
<ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
35+
<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' ">
3536
<Reference Include="System" />
3637
<Reference Include="System.Xml" />
3738
<Reference Include="Microsoft.CSharp" />

‎src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
5-
<TargetFramework>netstandard1.5</TargetFramework>
5+
<TargetFramework>netstandard2.0</TargetFramework>
66
<WarningsAsErrors>true</WarningsAsErrors>
77
<AssemblyOriginatorKeyFile>../../tools/Key.snk</AssemblyOriginatorKeyFile>
88
<SignAssembly>true</SignAssembly>

‎src/Microsoft.DotNet.InternalAbstractions/Microsoft.DotNet.InternalAbstractions.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<PackageReference Include="NETStandard.Library" Version="1.6.0" />
1818
</ItemGroup>
1919

20-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
20+
<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETStandard' ">
2121
<PackageReference Include="System.AppContext" Version="4.1.0" />
2222
<PackageReference Include="System.Collections" Version="4.0.11" />
2323
<PackageReference Include="System.IO" Version="4.1.0" />

‎src/Microsoft.DotNet.MSBuildSdkResolver/Interop.NETStandard.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// The netstandard1.5 adaptation here acts a proof-of-concept for cross-platform
66
// portability of the underlying hostfxr API and gives us build and test coverage
77
// on non-Windows machines. It also ships with msbuild on Mono.
8-
#if NETSTANDARD1_5
8+
#if NETSTANDARD2_0
99

1010
using System;
1111
using System.Runtime.InteropServices;
@@ -50,4 +50,4 @@ private static int hostfxr_resolve_sdk(string exe_dir, string working_dir, [Out]
5050
}
5151
}
5252

53-
#endif // NETSTANDARD1_5
53+
#endif // NETSTANDARD2_0

‎src/Microsoft.DotNet.MSBuildSdkResolver/MSBuildSdkResolver.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ private string GetDotnetExeDirectory()
176176
var environmentProvider = new EnvironmentProvider(_getEnvironmentVariable);
177177
var dotnetExe = environmentProvider.GetCommandPath("dotnet");
178178

179-
#if NETSTANDARD1_5
179+
#if NETSTANDARD2_0
180180
if (dotnetExe != null && !Interop.RunningOnWindows)
181181
{
182182
// e.g. on Linux the 'dotnet' command from PATH is a symlink so we need to

‎src/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
<PropertyGroup>
44
<Version>$(SdkVersion)</Version>
5-
<TargetFrameworks>netstandard1.5;net46</TargetFrameworks>
6-
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netstandard1.5</TargetFrameworks>
5+
<TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
6+
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netstandard2.0</TargetFrameworks>
77
<PlatformTarget>AnyCPU</PlatformTarget>
88
<RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
99
<WarningsAsErrors>true</WarningsAsErrors>
@@ -19,11 +19,16 @@
1919
<PackageReference Include="Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreDotNetHostResolverPackageVersion)" PrivateAssets="All" />
2020
</ItemGroup>
2121

22-
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.5'">
23-
<PackageReference Include="NETStandard.Library" Version="1.6.0" />
22+
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETStandard'">
23+
<PackageReference Include="NETStandard.Library" Version="2.0.0" />
2424
</ItemGroup>
2525

26-
<Target Name="ResolveHostfxrCopyLocalContent" Condition="'$(TargetFramework)' == 'net46'" DependsOnTargets="RunResolvePackageDependencies" BeforeTargets="AssignTargetPaths">
26+
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
27+
<Reference Include="System" />
28+
<Reference Include="System.Core" />
29+
</ItemGroup>
30+
31+
<Target Name="ResolveHostfxrCopyLocalContent" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" DependsOnTargets="RunResolvePackageDependencies" BeforeTargets="AssignTargetPaths">
2732
<ItemGroup>
2833
<Content Include="@(FileDefinitions->'%(ResolvedPath)')" Condition="'%(FileDefinitions.Path)' == 'runtimes/win-x86/native/hostfxr.dll'">
2934
<Link>x86/hostfxr.dll</Link>

‎src/dotnet/dotnet.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
</ItemGroup>
5353
<ItemGroup>
5454
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
55-
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.3.0" />
55+
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.4.0" />
5656
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.0.0" />
5757
<PackageReference Include="Microsoft.NETCore.App" Version="$(MicrosoftNETCoreAppPackageVersion)" />
5858
<PackageReference Include="System.Diagnostics.TraceSource" Version="4.3.0" />

0 commit comments

Comments
 (0)