From f1b49473f555d6e345d729cdef123c364be81b58 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Fri, 28 Feb 2025 11:33:29 +0100 Subject: [PATCH 1/4] Exclude netstandard1.x TFMs from PackageSourceGenerator.proj Finally, https://github.com/dotnet/source-build/issues/4482 is very close to be done (just the packages are left to be removed from SBRP). Therefore, we should filter out netstandard1.x TFMs when generating new packages with the PackageSourceGenerator tooling. --- src/packageSourceGenerator/PackageSourceGenerator.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/packageSourceGenerator/PackageSourceGenerator.proj b/src/packageSourceGenerator/PackageSourceGenerator.proj index 88f36f8ce0..4031809cfe 100644 --- a/src/packageSourceGenerator/PackageSourceGenerator.proj +++ b/src/packageSourceGenerator/PackageSourceGenerator.proj @@ -12,7 +12,7 @@ monoandroid*;monotouch*;net20;net35;net4*;netcore50;netcoreapp2.*;portable*;uap*;win8;win81;wp8;wpa81;xamarin* - $(ExcludeTargetFrameworks);netcoreapp3.1 + $(ExcludeTargetFrameworks);netcoreapp3.1;netstandard1* From 4e0d2fe5830752f17351eacb2c31bfba0016de2c Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Fri, 28 Feb 2025 12:36:33 +0100 Subject: [PATCH 2/4] Update netstandard1.x test packages --- tests/SbrpTests/GenerateScriptTests.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/SbrpTests/GenerateScriptTests.cs b/tests/SbrpTests/GenerateScriptTests.cs index a85eaf9f11..6d6e0a148d 100755 --- a/tests/SbrpTests/GenerateScriptTests.cs +++ b/tests/SbrpTests/GenerateScriptTests.cs @@ -21,10 +21,10 @@ public enum PackageType public static IEnumerable Data => new List { - new object[] { "System.Xml.ReaderWriter", "4.3.0", PackageType.Reference }, + new object[] { "System.Text.Json", "8.0.5", PackageType.Reference }, new object[] { "Microsoft.Extensions.Logging.Abstractions", "6.0.4", PackageType.Reference }, new object[] { "Microsoft.CodeAnalysis.CSharp", "3.11.0", PackageType.Reference }, - new object[] { "System.Security.Cryptography.Encoding", "4.3.0", PackageType.Reference }, + new object[] { "System.Security.Cryptography.ProtectedData", "9.0.2", PackageType.Reference }, new object[] { "Microsoft.Build.NoTargets", "3.7.0", PackageType.Text }, }; From b77bb6446be7c8dbdf4a6c8d58ec489da81c7674 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Fri, 28 Feb 2025 12:52:14 +0100 Subject: [PATCH 3/4] Update package --- tests/SbrpTests/GenerateScriptTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/SbrpTests/GenerateScriptTests.cs b/tests/SbrpTests/GenerateScriptTests.cs index 6d6e0a148d..2389ddb04d 100755 --- a/tests/SbrpTests/GenerateScriptTests.cs +++ b/tests/SbrpTests/GenerateScriptTests.cs @@ -24,7 +24,7 @@ public enum PackageType new object[] { "System.Text.Json", "8.0.5", PackageType.Reference }, new object[] { "Microsoft.Extensions.Logging.Abstractions", "6.0.4", PackageType.Reference }, new object[] { "Microsoft.CodeAnalysis.CSharp", "3.11.0", PackageType.Reference }, - new object[] { "System.Security.Cryptography.ProtectedData", "9.0.2", PackageType.Reference }, + new object[] { "System.Security.Cryptography.ProtectedData", "8.0.0", PackageType.Reference }, new object[] { "Microsoft.Build.NoTargets", "3.7.0", PackageType.Text }, }; From 8e0faa654a629c5f8b128b64a4f8604e86f329cb Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Fri, 28 Feb 2025 12:53:36 +0100 Subject: [PATCH 4/4] update test again --- tests/SbrpTests/GenerateScriptTests.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/SbrpTests/GenerateScriptTests.cs b/tests/SbrpTests/GenerateScriptTests.cs index 2389ddb04d..a8dc02d7ec 100755 --- a/tests/SbrpTests/GenerateScriptTests.cs +++ b/tests/SbrpTests/GenerateScriptTests.cs @@ -21,7 +21,6 @@ public enum PackageType public static IEnumerable Data => new List { - new object[] { "System.Text.Json", "8.0.5", PackageType.Reference }, new object[] { "Microsoft.Extensions.Logging.Abstractions", "6.0.4", PackageType.Reference }, new object[] { "Microsoft.CodeAnalysis.CSharp", "3.11.0", PackageType.Reference }, new object[] { "System.Security.Cryptography.ProtectedData", "8.0.0", PackageType.Reference },