Skip to content

Commit 25e6d35

Browse files
committed
Drop netstandard for $(NetCoreTFM)
Netstandard gives compatibility benefits for libraries to be used against netfx or netcore frameworks. However, for libman, all of our projects that run on netcore already target that framework directly. This change modifies the existing multitargeted projects to target netcore directly instead of netstandard. This will allow future changes to use conditional compilation to leverage newer APIs in netcore that do not exist in the netstandard API surface. The only breaking change here is that the Build project now uses .NET 8 for the build task. This means consumers of that package who are not using .NET Framework will need to have a compatible version of the SDK; however, this aligns with the prior change in the CLI tool to require .NET 8 as well.
1 parent 8ba77a6 commit 25e6d35

File tree

3 files changed

+8
-9
lines changed

3 files changed

+8
-9
lines changed

src/LibraryManager.Build/Microsoft.Web.LibraryManager.Build.csproj

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netstandard2.0;$(NetFxTFM)</TargetFrameworks>
3+
<TargetFrameworks>$(NetCoreTFM);$(NetFxTFM)</TargetFrameworks>
44
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
55
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
66
<PackageTags>library, package, client-side, build</PackageTags>
@@ -16,8 +16,7 @@
1616
<PackageReference Include="Microsoft.Build.Framework" PrivateAssets="all" />
1717
<PackageReference Include="Microsoft.Build.Tasks.Core" PrivateAssets="all" />
1818
<PackageReference Include="Microsoft.Build.Utilities.Core" PrivateAssets="all" />
19-
<PackageReference Include="System.Runtime.Loader" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
20-
<Reference Include="netstandard, Version=2.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
19+
<PackageReference Include="System.Runtime.Loader" Condition="'$(TargetFramework)' == '$(NetCoreTFM)'" />
2120
</ItemGroup>
2221

2322
<ItemGroup>

src/LibraryManager.Contracts/Microsoft.Web.LibraryManager.Contracts.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netstandard2.0;$(NetFxTFM)</TargetFrameworks>
3+
<TargetFrameworks>$(NetCoreTFM);$(NetFxTFM)</TargetFrameworks>
44
<PackageTags>library, package, client-side</PackageTags>
55
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
66
<GenerateDocumentationFile>true</GenerateDocumentationFile>

src/LibraryManager/Microsoft.Web.LibraryManager.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netstandard2.0;$(NetFxTFM)</TargetFrameworks>
3+
<TargetFrameworks>$(NetCoreTFM);$(NetFxTFM)</TargetFrameworks>
44
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
55
<PackageTags>library, package, client-side</PackageTags>
66
<GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -10,11 +10,11 @@
1010
<PackageReference Include="Minimatch" NoWarn="NU1603" />
1111
<PackageReference Include="Newtonsoft.Json" />
1212
<PackageReference Include="System.Security.Cryptography.ProtectedData" />
13-
<PackageReference Include="System.ValueTuple" Condition="'$(TargetFramework)' != 'netstandard2.0'" />
13+
<PackageReference Include="System.ValueTuple" Condition="'$(TargetFramework)' != '$(NetCoreTFM)'" />
1414
<ProjectReference Include="..\LibraryManager.Contracts\Microsoft.Web.LibraryManager.Contracts.csproj" />
15-
<Reference Include="System.ComponentModel.Composition" Condition="'$(TargetFramework)' != 'netstandard2.0'" />
16-
<Reference Include="System.Net.Http" Condition="'$(TargetFramework)' != 'netstandard2.0'" />
17-
<Reference Include="System.Web" Condition="'$(TargetFramework)' != 'netstandard2.0'" />
15+
<Reference Include="System.ComponentModel.Composition" Condition="'$(TargetFramework)' != '$(NetCoreTFM)'" />
16+
<Reference Include="System.Net.Http" Condition="'$(TargetFramework)' != '$(NetCoreTFM)'" />
17+
<Reference Include="System.Web" Condition="'$(TargetFramework)' != '$(NetCoreTFM)'" />
1818
</ItemGroup>
1919
<ItemGroup>
2020
<Compile Update="Resources\Text.Designer.cs">

0 commit comments

Comments
 (0)