From 0a85997537731a807885afacd2e0139de8500fd2 Mon Sep 17 00:00:00 2001 From: Rahul Bhandari Date: Wed, 12 Apr 2023 09:37:28 -0700 Subject: [PATCH 1/8] Create snapcraft.yaml --- src/snaps/dotnet-sdk-8.0/snap/snapcraft.yaml | 41 ++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 src/snaps/dotnet-sdk-8.0/snap/snapcraft.yaml diff --git a/src/snaps/dotnet-sdk-8.0/snap/snapcraft.yaml b/src/snaps/dotnet-sdk-8.0/snap/snapcraft.yaml new file mode 100644 index 000000000..b1b80a2d1 --- /dev/null +++ b/src/snaps/dotnet-sdk-8.0/snap/snapcraft.yaml @@ -0,0 +1,41 @@ +name: dotnet-sdk +version: 8.0.100-preview.3.23178.7 +summary: Cross-Platform .NET Core SDK +description: | + .NET Core SDK. https://dot.net/core. + +grade: stable +confinement: classic + +apps: + dotnet: + command: dotnet + +base: core18 + +parts: + dotnet-sdk: + plugin: dump + source: https://download.visualstudio.microsoft.com/download/pr/103d5e2c-d5c4-4101-bb6e-b82bc73a7d93/284a5cdccbc995f39806a3ba2dc17b93/dotnet-sdk-8.0.100-preview.3.23178.7-linux-x64.tar.gz + source-checksum: sha512/3b5d72979831256b9340a01db23d3b2dca801672546eeed04385949ed5f4363d3c731f31477ec82c7200ce88502dc45e03986c8acc8f2fc611b0343af5f1c488 + stage-packages: + - libicu60 + - libc6 + - libgcc1 + - libstdc++6 + - libssl1.0.0 + - libcurl3 + - libgssapi-krb5-2 + - zlib1g + - lldb + - libunwind8 + - libtinfo5 + - liblttng-ust0 + - liburcu6 + + runtime-wrapper: + plugin: dump + source: . + + + From 9586d0d9e20b8863590709e427135be8bbc47516 Mon Sep 17 00:00:00 2001 From: Rahul Bhandari Date: Wed, 12 Apr 2023 09:38:35 -0700 Subject: [PATCH 2/8] Update snapcraft.yaml --- src/snaps/dotnet-sdk-7.0/snap/snapcraft.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/snaps/dotnet-sdk-7.0/snap/snapcraft.yaml b/src/snaps/dotnet-sdk-7.0/snap/snapcraft.yaml index 5463efd62..597f3985f 100644 --- a/src/snaps/dotnet-sdk-7.0/snap/snapcraft.yaml +++ b/src/snaps/dotnet-sdk-7.0/snap/snapcraft.yaml @@ -1,5 +1,5 @@ name: dotnet-sdk -version: 7.0.100-preview.1.22110.4 +version: 7.0.203 summary: Cross-Platform .NET Core SDK description: | .NET Core SDK. https://dot.net/core. @@ -16,8 +16,8 @@ base: core18 parts: dotnet-sdk: plugin: dump - source: https://download.visualstudio.microsoft.com/download/pr/1af9d3c3-a20e-400c-abe5-3d80dec7b63b/803f8dc5cf21fb28245aba71a7fdbc05/dotnet-sdk-7.0.100-preview.1.22110.4-linux-x64.tar.gz - source-checksum: sha512/54488a911172f059e3823d6bf52e1fa87305eb09e84d97f81a40e0815fc8a73a480b149023283f557a672ef0341f022b8ca16ebec92264ee16a56fac8f35e2e2 + source: https://download.visualstudio.microsoft.com/download/pr/ebfd0bf8-79bd-480a-9e81-0b217463738d/9adc6bf0614ce02670101e278a2d8555/dotnet-sdk-7.0.203-linux-x64.tar.gz + source-checksum: sha512/ed1ae7cd88591ec52e1515c4a25d9a832eca29e8a0889549fea35a320e6e356e3806a17289f71fc0b04c36b006ae74446c53771d976c170fcbe5977ac7db1cb6 stage-packages: - libicu60 - libc6 @@ -36,3 +36,6 @@ parts: runtime-wrapper: plugin: dump source: . + + + From da336f2877cedc26d60f426cefe6295ecc1d74f3 Mon Sep 17 00:00:00 2001 From: Rahul Bhandari Date: Wed, 12 Apr 2023 09:39:06 -0700 Subject: [PATCH 3/8] Update snapcraft.yaml --- src/snaps/dotnet-sdk-6.0/snap/snapcraft.yaml | 31 ++++++++++++-------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/src/snaps/dotnet-sdk-6.0/snap/snapcraft.yaml b/src/snaps/dotnet-sdk-6.0/snap/snapcraft.yaml index bfbe2c9a4..0d2bd36c4 100755 --- a/src/snaps/dotnet-sdk-6.0/snap/snapcraft.yaml +++ b/src/snaps/dotnet-sdk-6.0/snap/snapcraft.yaml @@ -1,5 +1,5 @@ name: dotnet-sdk -version: 6.0.100-preview.2.21155.3 +version: 6.0.408 summary: Cross-Platform .NET Core SDK description: | .NET Core SDK. https://dot.net/core. @@ -16,21 +16,26 @@ base: core18 parts: dotnet-sdk: plugin: dump - source: https://download.visualstudio.microsoft.com/download/pr/25c7e38e-0a6a-4d66-ac4e-b550a44b8a98/49128be84b903799259e7bebe8e9d969/dotnet-sdk-6.0.100-preview.2.21155.3-linux-x64.tar.gz - source-checksum: sha512/90d9b6070f7732dcf75f5a09a4f10f9b23c835a3bb144e0c3f1fa451cadd3d49c9781973b180f70a4d2798358a7c00f3c0b9b3bf35326fe4c94e470e84ac8c35 + source: https://download.visualstudio.microsoft.com/download/pr/dd7d2255-c9c1-4c6f-b8ad-6e853d6bb574/c8e1b5f47bf17b317a84487491915178/dotnet-sdk-6.0.408-linux-x64.tar.gz + source-checksum: sha512/d5eed37ce6c07546aa217d6e786f3b67be2b6d97c23d5888d9ee5d5398e8a9bfc06202b14e3529245f7ec78f4036778caf69bdbe099de805fe1f566277e8440e stage-packages: - - libicu60 - - libssl1.0.0 - - libcurl3 - - libgssapi-krb5-2 - - libstdc++6 - - zlib1g - - libgcc1 - - libtinfo5 - - liblttng-ust0 - - liburcu6 + - libicu60 + - libc6 + - libgcc1 + - libstdc++6 + - libssl1.0.0 + - libcurl3 + - libgssapi-krb5-2 + - zlib1g + - lldb + - libunwind8 + - libtinfo5 + - liblttng-ust0 + - liburcu6 runtime-wrapper: plugin: dump source: . + + From 9215a5792efd51597ae23e904e3563056eb2698b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 12 Apr 2023 10:33:29 -0700 Subject: [PATCH 4/8] [main] Update dependencies from dotnet/arcade (#16071) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 2 +- global.json | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index af8e4c557..8cdd330a1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,18 +193,18 @@ - + https://github.com/dotnet/arcade - e5c569253a4cecd110830acbf1ffae96d5a37cc6 + 17d9eee32f20a6af0ebb620254a22f601d159578 - + https://github.com/dotnet/arcade - e5c569253a4cecd110830acbf1ffae96d5a37cc6 + 17d9eee32f20a6af0ebb620254a22f601d159578 - + https://github.com/dotnet/arcade - e5c569253a4cecd110830acbf1ffae96d5a37cc6 + 17d9eee32f20a6af0ebb620254a22f601d159578 https://github.com/dotnet/arcade-services @@ -223,14 +223,14 @@ 02ee87c8a232a9786b56cd2102cf318559e72210 - + https://github.com/dotnet/sourcelink 759f344923a0859f3fae83431d0ba1cc62108118 - + https://github.com/dotnet/xliff-tasks - a0d9b0e10c67721157c066abb9210d1e3e774014 + 519d565b45c46ac452fe5a77ab63295138992e07 diff --git a/eng/Versions.props b/eng/Versions.props index c5b45b7de..c9a2175bb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 8.0.0-beta.23210.3 + 8.0.0-beta.23211.8 diff --git a/global.json b/global.json index 81617e22f..97875b19a 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.100-preview.1.23115.2", + "dotnet": "8.0.100-preview.3.23178.7", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23210.3", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23210.3" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23211.8", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23211.8" } } From 6f5138826c8eae766d54d499ab1c7b9c9d0e9bc7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Apr 2023 19:12:29 +0000 Subject: [PATCH 5/8] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20230412.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23212.2 -> To Version 8.0.0-alpha.1.23212.3 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8cdd330a1..dae6f7981 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -218,9 +218,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 02ee87c8a232a9786b56cd2102cf318559e72210 + 4c32e59ca9d197152781cbc4c424987667bd2d05 From dc76a05e0ba0da27c7092cfe8db10f37569e65cb Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Wed, 12 Apr 2023 15:31:37 -0500 Subject: [PATCH 6/8] Add CA1512 NoWarn for aspnetcore (#16076) --- .../content/repo-projects/aspnetcore.proj | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/SourceBuild/content/repo-projects/aspnetcore.proj b/src/SourceBuild/content/repo-projects/aspnetcore.proj index abd2b580e..17aef7931 100644 --- a/src/SourceBuild/content/repo-projects/aspnetcore.proj +++ b/src/SourceBuild/content/repo-projects/aspnetcore.proj @@ -24,16 +24,9 @@ true - - CS0618;CA1825;CS8600;CS8604 + + CA1512 From f2d17c523c08f4f4864a54bb6d717f9a5f3c8f79 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Wed, 12 Apr 2023 15:54:05 -0500 Subject: [PATCH 7/8] Update poison baseline (#16079) --- .../assets/baselines/PoisonUsage.txt | 54 ------------------- 1 file changed, 54 deletions(-) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt index 02d2c7cf5..0cd3b4111 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt @@ -1,58 +1,4 @@ - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - AssemblyAttribute From 0c5d3f4dd4abde3aad7c40e162794ef040ac4b9b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Apr 2023 21:07:51 +0000 Subject: [PATCH 8/8] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20230412.4 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23212.2 -> To Version 8.0.0-alpha.1.23212.4 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dae6f7981..3f62c08e6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -218,9 +218,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 4c32e59ca9d197152781cbc4c424987667bd2d05 + 9092071034fa818fef8b8fd6ae9ac32c826ef040