Skip to content

Remove netstandard1.x packages and support infrastructure #1179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 28, 2025
Merged

Remove netstandard1.x packages and support infrastructure #1179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3606c1b
Remove more netstandard1.x packages and infra support for it
ViktorHofer Feb 28, 2025
16af257
Exclude netstandard1.x TFMs from PackageSourceGenerator.proj and upda…
ViktorHofer Feb 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 0 additions & 3 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@
equality with real packages.
-->
<Serviceable />
<!-- TODO: Remove netstandard1.x TFMs. https://github.com/dotnet/source-build/issues/4482 -->
<CheckNotRecommendedTargetFramework>false</CheckNotRecommendedTargetFramework>

<CustomizationsPrefix>Customizations</CustomizationsPrefix>
<CustomizationsPropsFile>$(CustomizationsPrefix).props</CustomizationsPropsFile>
<CustomizationsSourceFile>$(CustomizationsPrefix).cs</CustomizationsSourceFile>
Expand Down
2 changes: 1 addition & 1 deletion src/packageSourceGenerator/PackageSourceGenerator.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<ExcludeTargetFrameworks>monoandroid*;monotouch*;net20;net35;net4*;netcore50;netcoreapp2.*;portable*;uap*;win8;win81;wp8;wpa81;xamarin*</ExcludeTargetFrameworks>
<!-- The following target frameworks should be excluded even though they are supported by the current SDK because there is no need to have them.
Only exclude them when target frameworks to include aren't provided. -->
<ExcludeTargetFrameworks Condition="'$(IncludeTargetFrameworks)' == ''">$(ExcludeTargetFrameworks);netcoreapp3.1</ExcludeTargetFrameworks>
<ExcludeTargetFrameworks Condition="'$(IncludeTargetFrameworks)' == ''">$(ExcludeTargetFrameworks);netcoreapp3.1;netstandard1*</ExcludeTargetFrameworks>
</PropertyGroup>

<PropertyGroup Condition="'$(PackageName)' != '' and '$(PackageVersion)' != ''">
Expand Down
57 changes: 0 additions & 57 deletions src/referencePackages/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,63 +2,6 @@

<Import Project="..\..\Directory.Build.targets" />

<PropertyGroup>
<NetStandard1xPackage>
Microsoft.NETCore.Platforms;
Microsoft.Win32.Primitives;
System.AppContext;
System.Collections;
System.Collections.Concurrent;
System.Console;
System.Diagnostics.Debug;
System.Diagnostics.DiagnosticSource;
System.Diagnostics.Tools;
System.Diagnostics.Tracing;
System.Globalization;
System.Globalization.Calendars;
System.IO;
System.IO.Compression;
System.IO.Compression.ZipFile;
System.IO.FileSystem;
System.IO.FileSystem.Primitives;
System.Linq;
System.Linq.Expressions;
System.Net.Http;
System.Net.Primitives;
System.Net.Sockets;
System.ObjectModel;
System.Reflection;
System.Reflection.Extensions;
System.Reflection.Primitives;
System.Resources.ResourceManager;
System.Runtime;
System.Runtime.Extensions;
System.Runtime.Handles;
System.Runtime.InteropServices;
System.Runtime.InteropServices.RuntimeInformation;
System.Runtime.Numerics;
System.Security.Cryptography.Algorithms;
System.Security.Cryptography.Cng;
System.Security.Cryptography.Encoding;
System.Security.Cryptography.Primitives;
System.Security.Cryptography.OpenSsl;
System.Security.Cryptography.X509Certificates;
System.Text.Encoding;
System.Text.Encoding.Extensions;
System.Text.RegularExpressions;
System.Threading;
System.Threading.Tasks;
System.Threading.Timer;
System.Xml.ReaderWriter;
System.Xml.XDocument;
</NetStandard1xPackage>
</PropertyGroup>

<PropertyGroup>
<!-- When the library targets netstandard1.x and is part of the .NET Standard 1.x dependency graph, disable the implicit framework references to avoid cyclic dependencies. -->
<DisableImplicitFrameworkReferences Condition="'$(DisableImplicitFrameworkReferences)' == '' and ($(TargetFramework.StartsWith('netstandard1')) or '$(TargetFramework)' == 'netcoreapp1.1') and $(NetStandard1xPackage.Contains('$(AssemblyName);'))">true</DisableImplicitFrameworkReferences>
</PropertyGroup>

<ItemGroup>
<Compile Include="ref/$(TargetFramework)/*$(DefaultLanguageSourceExtension)" />
<Compile Include="lib/$(TargetFramework)/*$(DefaultLanguageSourceExtension)" />
Expand Down
6 changes: 1 addition & 5 deletions src/referencePackages/src/microsoft.csharp/4.7.0/Microsoft.CSharp.4.7.0.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard1.0;netstandard2.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<AssemblyName>Microsoft.CSharp</AssemblyName>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.0'">
<PackageReference Include="System.Dynamic.Runtime" Version="4.3.0" />
</ItemGroup>

</Project>
9 changes: 0 additions & 9 deletions src/referencePackages/src/microsoft.csharp/4.7.0/microsoft.csharp.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,6 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<serviceable>true</serviceable>
<dependencies>
<group targetFramework=".NETStandard1.0">
<dependency id="NETStandard.Library" version="1.6.1" />
<dependency id="System.Dynamic.Runtime" version="4.3.0" />
</group>
<group targetFramework=".NETStandard1.3">
<dependency id="NETStandard.Library" version="1.6.1" />
<dependency id="System.Dynamic.Runtime" version="4.3.0" />
<dependency id="System.Reflection.TypeExtensions" version="4.7.0" exclude="Compile" />
</group>
<group targetFramework=".NETStandard2.0" />
</dependencies>
</metadata>
Expand Down
103 changes: 0 additions & 103 deletions src/referencePackages/src/microsoft.csharp/4.7.0/ref/netstandard1.0/Microsoft.CSharp.cs
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/referencePackages/src/microsoft.visualbasic/10.3.0/Microsoft.VisualBasic.10.3.0.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard1.1;netstandard2.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<AssemblyName>Microsoft.VisualBasic</AssemblyName>
</PropertyGroup>

Expand Down
8 changes: 0 additions & 8 deletions src/referencePackages/src/microsoft.visualbasic/10.3.0/microsoft.visualbasic.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,6 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<serviceable>true</serviceable>
<dependencies>
<group targetFramework=".NETStandard1.1">
<dependency id="NETStandard.Library" version="1.6.1" />
</group>
<group targetFramework=".NETStandard1.3">
<dependency id="NETStandard.Library" version="1.6.1" />
<dependency id="System.Dynamic.Runtime" version="4.3.0" exclude="Compile" />
<dependency id="System.Reflection.TypeExtensions" version="4.4.0" exclude="Compile" />
</group>
<group targetFramework=".NETStandard2.0" />
</dependencies>
</metadata>
Expand Down
Loading