From fc7d7fccad607b773e9e92f05447ea34cfa3a58c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 13 Jan 2025 12:12:56 +0000 Subject: [PATCH 1/6] Update .NET SDK Update .NET SDK to version 10.0.100-alpha.1.25063.8. --- updated-dependencies: - dependency-name: Microsoft.NET.Sdk dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: github-actions[bot] --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index 008e9771d767..79a15113735b 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "sdk": { - "version": "10.0.100-alpha.1.25056.1" + "version": "10.0.100-alpha.1.25063.8" }, "tools": { - "dotnet": "10.0.100-alpha.1.25056.1", + "dotnet": "10.0.100-alpha.1.25063.8", "runtimes": { "dotnet/x86": [ "$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)" From cd5121ca48784af441ab900fb27541bcb855e521 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 16 Jan 2025 19:50:33 +0100 Subject: [PATCH 2/6] Suppress CP1002 temporarily via NoWarn The NoWarn can be removed when https://github.com/dotnet/sdk/pull/46059 got merged and consumed with a new .NET SDK. --- .../src/Microsoft.Extensions.Caching.SqlServer.csproj | 3 ++- .../DataProtection/src/CompatibilitySuppressions.xml | 11 ----------- .../src/Microsoft.AspNetCore.DataProtection.csproj | 2 ++ .../Extensions/src/CompatibilitySuppressions.xml | 11 ----------- ...rosoft.AspNetCore.DataProtection.Extensions.csproj | 2 ++ .../src/CompatibilitySuppressions.xml | 11 ----------- ...spNetCore.DataProtection.StackExchangeRedis.csproj | 2 ++ .../JsonPatch/src/CompatibilitySuppressions.xml | 11 ----------- .../src/Microsoft.AspNetCore.JsonPatch.csproj | 2 ++ .../Embedded/src/CompatibilitySuppressions.xml | 8 -------- ...Microsoft.Extensions.FileProviders.Embedded.csproj | 2 ++ .../src/CompatibilitySuppressions.xml | 11 ----------- ...ft.AspNetCore.SignalR.Protocols.MessagePack.csproj | 2 ++ .../src/CompatibilitySuppressions.xml | 11 ----------- ...AspNetCore.SignalR.Protocols.NewtonsoftJson.csproj | 2 ++ 15 files changed, 16 insertions(+), 75 deletions(-) delete mode 100644 src/DataProtection/DataProtection/src/CompatibilitySuppressions.xml delete mode 100644 src/DataProtection/Extensions/src/CompatibilitySuppressions.xml delete mode 100644 src/DataProtection/StackExchangeRedis/src/CompatibilitySuppressions.xml delete mode 100644 src/Features/JsonPatch/src/CompatibilitySuppressions.xml delete mode 100644 src/SignalR/common/Protocols.MessagePack/src/CompatibilitySuppressions.xml delete mode 100644 src/SignalR/common/Protocols.NewtonsoftJson/src/CompatibilitySuppressions.xml diff --git a/src/Caching/SqlServer/src/Microsoft.Extensions.Caching.SqlServer.csproj b/src/Caching/SqlServer/src/Microsoft.Extensions.Caching.SqlServer.csproj index 3088ff699532..8ebea21bcbbd 100644 --- a/src/Caching/SqlServer/src/Microsoft.Extensions.Caching.SqlServer.csproj +++ b/src/Caching/SqlServer/src/Microsoft.Extensions.Caching.SqlServer.csproj @@ -6,7 +6,8 @@ true cache;distributedcache;sqlserver true - $(NoWarn);PKG0001 + + $(NoWarn);PKG0001;CP1002 true true diff --git a/src/DataProtection/DataProtection/src/CompatibilitySuppressions.xml b/src/DataProtection/DataProtection/src/CompatibilitySuppressions.xml deleted file mode 100644 index aeb07dcc013f..000000000000 --- a/src/DataProtection/DataProtection/src/CompatibilitySuppressions.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - CP1002 - SMDiagnostics.dll - - - CP1002 - System.ServiceModel.Internals.dll - - \ No newline at end of file diff --git a/src/DataProtection/DataProtection/src/Microsoft.AspNetCore.DataProtection.csproj b/src/DataProtection/DataProtection/src/Microsoft.AspNetCore.DataProtection.csproj index 92fa8a526a84..d0b826767e15 100644 --- a/src/DataProtection/DataProtection/src/Microsoft.AspNetCore.DataProtection.csproj +++ b/src/DataProtection/DataProtection/src/Microsoft.AspNetCore.DataProtection.csproj @@ -12,6 +12,8 @@ annotations enable true + + $(NoWarn);CP1002 diff --git a/src/DataProtection/Extensions/src/CompatibilitySuppressions.xml b/src/DataProtection/Extensions/src/CompatibilitySuppressions.xml deleted file mode 100644 index aeb07dcc013f..000000000000 --- a/src/DataProtection/Extensions/src/CompatibilitySuppressions.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - CP1002 - SMDiagnostics.dll - - - CP1002 - System.ServiceModel.Internals.dll - - \ No newline at end of file diff --git a/src/DataProtection/Extensions/src/Microsoft.AspNetCore.DataProtection.Extensions.csproj b/src/DataProtection/Extensions/src/Microsoft.AspNetCore.DataProtection.Extensions.csproj index 5b44128f30b5..9ad2c00076a9 100644 --- a/src/DataProtection/Extensions/src/Microsoft.AspNetCore.DataProtection.Extensions.csproj +++ b/src/DataProtection/Extensions/src/Microsoft.AspNetCore.DataProtection.Extensions.csproj @@ -8,6 +8,8 @@ true aspnetcore;dataprotection true + + $(NoWarn);CP1002 diff --git a/src/DataProtection/StackExchangeRedis/src/CompatibilitySuppressions.xml b/src/DataProtection/StackExchangeRedis/src/CompatibilitySuppressions.xml deleted file mode 100644 index aeb07dcc013f..000000000000 --- a/src/DataProtection/StackExchangeRedis/src/CompatibilitySuppressions.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - CP1002 - SMDiagnostics.dll - - - CP1002 - System.ServiceModel.Internals.dll - - \ No newline at end of file diff --git a/src/DataProtection/StackExchangeRedis/src/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.csproj b/src/DataProtection/StackExchangeRedis/src/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.csproj index a53ec8f13207..dbe92b50cefc 100644 --- a/src/DataProtection/StackExchangeRedis/src/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.csproj +++ b/src/DataProtection/StackExchangeRedis/src/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.csproj @@ -7,6 +7,8 @@ true aspnetcore;dataprotection;redis true + + $(NoWarn);CP1002 diff --git a/src/Features/JsonPatch/src/CompatibilitySuppressions.xml b/src/Features/JsonPatch/src/CompatibilitySuppressions.xml deleted file mode 100644 index aeb07dcc013f..000000000000 --- a/src/Features/JsonPatch/src/CompatibilitySuppressions.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - CP1002 - SMDiagnostics.dll - - - CP1002 - System.ServiceModel.Internals.dll - - \ No newline at end of file diff --git a/src/Features/JsonPatch/src/Microsoft.AspNetCore.JsonPatch.csproj b/src/Features/JsonPatch/src/Microsoft.AspNetCore.JsonPatch.csproj index 57cc0737ff21..4ec43204abcb 100644 --- a/src/Features/JsonPatch/src/Microsoft.AspNetCore.JsonPatch.csproj +++ b/src/Features/JsonPatch/src/Microsoft.AspNetCore.JsonPatch.csproj @@ -8,6 +8,8 @@ true aspnetcore;json;jsonpatch disable + + $(NoWarn);CP1002 diff --git a/src/FileProviders/Embedded/src/CompatibilitySuppressions.xml b/src/FileProviders/Embedded/src/CompatibilitySuppressions.xml index d8abf08409d2..9487263e1b4d 100644 --- a/src/FileProviders/Embedded/src/CompatibilitySuppressions.xml +++ b/src/FileProviders/Embedded/src/CompatibilitySuppressions.xml @@ -1,13 +1,5 @@  - - CP1002 - SMDiagnostics.dll - - - CP1002 - System.ServiceModel.Internals.dll - CP1003 lib/net7.0/Microsoft.Extensions.FileProviders.Embedded.dll diff --git a/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.csproj b/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.csproj index 590c4e980042..2a5f0036e254 100644 --- a/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.csproj +++ b/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.csproj @@ -13,6 +13,8 @@ true enable true + + $(NoWarn);CP1002 diff --git a/src/SignalR/common/Protocols.MessagePack/src/CompatibilitySuppressions.xml b/src/SignalR/common/Protocols.MessagePack/src/CompatibilitySuppressions.xml deleted file mode 100644 index aeb07dcc013f..000000000000 --- a/src/SignalR/common/Protocols.MessagePack/src/CompatibilitySuppressions.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - CP1002 - SMDiagnostics.dll - - - CP1002 - System.ServiceModel.Internals.dll - - \ No newline at end of file diff --git a/src/SignalR/common/Protocols.MessagePack/src/Microsoft.AspNetCore.SignalR.Protocols.MessagePack.csproj b/src/SignalR/common/Protocols.MessagePack/src/Microsoft.AspNetCore.SignalR.Protocols.MessagePack.csproj index be6f0bab32e3..884abff931b6 100644 --- a/src/SignalR/common/Protocols.MessagePack/src/Microsoft.AspNetCore.SignalR.Protocols.MessagePack.csproj +++ b/src/SignalR/common/Protocols.MessagePack/src/Microsoft.AspNetCore.SignalR.Protocols.MessagePack.csproj @@ -6,6 +6,8 @@ Microsoft.AspNetCore.SignalR true enable + + $(NoWarn);CP1002 diff --git a/src/SignalR/common/Protocols.NewtonsoftJson/src/CompatibilitySuppressions.xml b/src/SignalR/common/Protocols.NewtonsoftJson/src/CompatibilitySuppressions.xml deleted file mode 100644 index aeb07dcc013f..000000000000 --- a/src/SignalR/common/Protocols.NewtonsoftJson/src/CompatibilitySuppressions.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - CP1002 - SMDiagnostics.dll - - - CP1002 - System.ServiceModel.Internals.dll - - \ No newline at end of file diff --git a/src/SignalR/common/Protocols.NewtonsoftJson/src/Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson.csproj b/src/SignalR/common/Protocols.NewtonsoftJson/src/Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson.csproj index 6b621b28bc00..4253fe9c92d3 100644 --- a/src/SignalR/common/Protocols.NewtonsoftJson/src/Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson.csproj +++ b/src/SignalR/common/Protocols.NewtonsoftJson/src/Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson.csproj @@ -6,6 +6,8 @@ Microsoft.AspNetCore.SignalR true enable + + $(NoWarn);CP1002 From 76cdeef2baec77bfdbbd9fa73c222112870f7801 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Fri, 17 Jan 2025 11:31:18 +0100 Subject: [PATCH 3/6] Remove NoWarns completely --- .../SqlServer/src/CompatibilitySuppressions.xml | 11 ----------- .../src/Microsoft.Extensions.Caching.SqlServer.csproj | 3 +-- .../src/Microsoft.AspNetCore.DataProtection.csproj | 2 -- ...rosoft.AspNetCore.DataProtection.Extensions.csproj | 2 -- ...spNetCore.DataProtection.StackExchangeRedis.csproj | 2 -- .../src/Microsoft.AspNetCore.JsonPatch.csproj | 2 -- ...Microsoft.Extensions.FileProviders.Embedded.csproj | 2 -- ...ft.AspNetCore.SignalR.Protocols.MessagePack.csproj | 2 -- ...AspNetCore.SignalR.Protocols.NewtonsoftJson.csproj | 2 -- 9 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 src/Caching/SqlServer/src/CompatibilitySuppressions.xml diff --git a/src/Caching/SqlServer/src/CompatibilitySuppressions.xml b/src/Caching/SqlServer/src/CompatibilitySuppressions.xml deleted file mode 100644 index fa12ab27fb23..000000000000 --- a/src/Caching/SqlServer/src/CompatibilitySuppressions.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - CP1002 - System.ServiceModel.Internals.dll - - - CP1002 - SMDiagnostics.dll - - \ No newline at end of file diff --git a/src/Caching/SqlServer/src/Microsoft.Extensions.Caching.SqlServer.csproj b/src/Caching/SqlServer/src/Microsoft.Extensions.Caching.SqlServer.csproj index 8ebea21bcbbd..3088ff699532 100644 --- a/src/Caching/SqlServer/src/Microsoft.Extensions.Caching.SqlServer.csproj +++ b/src/Caching/SqlServer/src/Microsoft.Extensions.Caching.SqlServer.csproj @@ -6,8 +6,7 @@ true cache;distributedcache;sqlserver true - - $(NoWarn);PKG0001;CP1002 + $(NoWarn);PKG0001 true true diff --git a/src/DataProtection/DataProtection/src/Microsoft.AspNetCore.DataProtection.csproj b/src/DataProtection/DataProtection/src/Microsoft.AspNetCore.DataProtection.csproj index d0b826767e15..92fa8a526a84 100644 --- a/src/DataProtection/DataProtection/src/Microsoft.AspNetCore.DataProtection.csproj +++ b/src/DataProtection/DataProtection/src/Microsoft.AspNetCore.DataProtection.csproj @@ -12,8 +12,6 @@ annotations enable true - - $(NoWarn);CP1002 diff --git a/src/DataProtection/Extensions/src/Microsoft.AspNetCore.DataProtection.Extensions.csproj b/src/DataProtection/Extensions/src/Microsoft.AspNetCore.DataProtection.Extensions.csproj index 9ad2c00076a9..5b44128f30b5 100644 --- a/src/DataProtection/Extensions/src/Microsoft.AspNetCore.DataProtection.Extensions.csproj +++ b/src/DataProtection/Extensions/src/Microsoft.AspNetCore.DataProtection.Extensions.csproj @@ -8,8 +8,6 @@ true aspnetcore;dataprotection true - - $(NoWarn);CP1002 diff --git a/src/DataProtection/StackExchangeRedis/src/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.csproj b/src/DataProtection/StackExchangeRedis/src/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.csproj index dbe92b50cefc..a53ec8f13207 100644 --- a/src/DataProtection/StackExchangeRedis/src/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.csproj +++ b/src/DataProtection/StackExchangeRedis/src/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.csproj @@ -7,8 +7,6 @@ true aspnetcore;dataprotection;redis true - - $(NoWarn);CP1002 diff --git a/src/Features/JsonPatch/src/Microsoft.AspNetCore.JsonPatch.csproj b/src/Features/JsonPatch/src/Microsoft.AspNetCore.JsonPatch.csproj index 4ec43204abcb..57cc0737ff21 100644 --- a/src/Features/JsonPatch/src/Microsoft.AspNetCore.JsonPatch.csproj +++ b/src/Features/JsonPatch/src/Microsoft.AspNetCore.JsonPatch.csproj @@ -8,8 +8,6 @@ true aspnetcore;json;jsonpatch disable - - $(NoWarn);CP1002 diff --git a/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.csproj b/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.csproj index 2a5f0036e254..590c4e980042 100644 --- a/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.csproj +++ b/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.csproj @@ -13,8 +13,6 @@ true enable true - - $(NoWarn);CP1002 diff --git a/src/SignalR/common/Protocols.MessagePack/src/Microsoft.AspNetCore.SignalR.Protocols.MessagePack.csproj b/src/SignalR/common/Protocols.MessagePack/src/Microsoft.AspNetCore.SignalR.Protocols.MessagePack.csproj index 884abff931b6..be6f0bab32e3 100644 --- a/src/SignalR/common/Protocols.MessagePack/src/Microsoft.AspNetCore.SignalR.Protocols.MessagePack.csproj +++ b/src/SignalR/common/Protocols.MessagePack/src/Microsoft.AspNetCore.SignalR.Protocols.MessagePack.csproj @@ -6,8 +6,6 @@ Microsoft.AspNetCore.SignalR true enable - - $(NoWarn);CP1002 diff --git a/src/SignalR/common/Protocols.NewtonsoftJson/src/Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson.csproj b/src/SignalR/common/Protocols.NewtonsoftJson/src/Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson.csproj index 4253fe9c92d3..6b621b28bc00 100644 --- a/src/SignalR/common/Protocols.NewtonsoftJson/src/Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson.csproj +++ b/src/SignalR/common/Protocols.NewtonsoftJson/src/Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson.csproj @@ -6,8 +6,6 @@ Microsoft.AspNetCore.SignalR true enable - - $(NoWarn);CP1002 From bd7e6de415d690c586ad5df0ee16240429d48450 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Fri, 17 Jan 2025 14:19:09 +0100 Subject: [PATCH 4/6] Update SDK and dotnet tool versions --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index 79a15113735b..7257de744026 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "sdk": { - "version": "10.0.100-alpha.1.25063.8" + "version": "10.0.100-alpha.1.25067.2" }, "tools": { - "dotnet": "10.0.100-alpha.1.25063.8", + "dotnet": "10.0.100-alpha.1.25067.2", "runtimes": { "dotnet/x86": [ "$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)" From efacad2dce3667cde523e4fe5efe8085cf3b5d39 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Fri, 17 Jan 2025 17:49:34 +0100 Subject: [PATCH 5/6] Update SDK and tools version in global.json --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index 7257de744026..7d49350cb526 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "sdk": { - "version": "10.0.100-alpha.1.25067.2" + "version": "10.0.100-alpha.1.25067.4" }, "tools": { - "dotnet": "10.0.100-alpha.1.25067.2", + "dotnet": "10.0.100-alpha.1.25067.4", "runtimes": { "dotnet/x86": [ "$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)" From 8b53a1f1e79fa4ec05ab174a44aaa5573b8187cc Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Fri, 17 Jan 2025 23:02:12 +0100 Subject: [PATCH 6/6] NoWarn CP1002 for MessagePack project --- .../Microsoft.AspNetCore.SignalR.Protocols.MessagePack.csproj | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/SignalR/common/Protocols.MessagePack/src/Microsoft.AspNetCore.SignalR.Protocols.MessagePack.csproj b/src/SignalR/common/Protocols.MessagePack/src/Microsoft.AspNetCore.SignalR.Protocols.MessagePack.csproj index be6f0bab32e3..f1ac288c2877 100644 --- a/src/SignalR/common/Protocols.MessagePack/src/Microsoft.AspNetCore.SignalR.Protocols.MessagePack.csproj +++ b/src/SignalR/common/Protocols.MessagePack/src/Microsoft.AspNetCore.SignalR.Protocols.MessagePack.csproj @@ -6,6 +6,9 @@ Microsoft.AspNetCore.SignalR true enable + + $(NoWarn);CP1002