diff --git a/NuGet.config b/NuGet.config index 6d004c295..1ebc99984 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,8 +6,30 @@ + + + + + + + + + + + + + + + + + + + + - + + + @@ -29,9 +51,19 @@ + + + + + + + + + + diff --git a/eng/Signing.props b/eng/Signing.props index 3a2373f9e..0d49f78d1 100644 --- a/eng/Signing.props +++ b/eng/Signing.props @@ -7,12 +7,9 @@ - - - - - - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 07dbda648..0c67dca18 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,45 +2,45 @@ - https://github.com/dotnet/windowsdesktop - 8a6506751c4e473fb277dd81df3c8ace41a1dfa7 + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + 417429fc040af552532bb07aad29e5e8639b840f - - https://github.com/dotnet/windowsdesktop - 8a6506751c4e473fb277dd81df3c8ace41a1dfa7 + + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + 417429fc040af552532bb07aad29e5e8639b840f - - https://github.com/dotnet/windowsdesktop - 8a6506751c4e473fb277dd81df3c8ace41a1dfa7 + + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + 417429fc040af552532bb07aad29e5e8639b840f - https://github.com/dotnet/windowsdesktop - 8a6506751c4e473fb277dd81df3c8ace41a1dfa7 + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + 417429fc040af552532bb07aad29e5e8639b840f - - https://github.com/dotnet/runtime - d25158d0dffd699340cedcfd43324c87a809a214 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - - https://github.com/dotnet/runtime - d25158d0dffd699340cedcfd43324c87a809a214 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - - https://github.com/dotnet/runtime - d25158d0dffd699340cedcfd43324c87a809a214 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - - https://github.com/dotnet/runtime - d25158d0dffd699340cedcfd43324c87a809a214 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - - https://github.com/dotnet/runtime - d25158d0dffd699340cedcfd43324c87a809a214 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - - https://github.com/dotnet/runtime - d25158d0dffd699340cedcfd43324c87a809a214 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - - https://github.com/dotnet/runtime - d25158d0dffd699340cedcfd43324c87a809a214 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - - https://github.com/dotnet/aspnetcore - c6865355c01e1fb170b65427846d939559ab3789 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + bb01bbf4433e27289b99001b7de6a582879d1835 - - https://github.com/dotnet/aspnetcore - c6865355c01e1fb170b65427846d939559ab3789 - - - https://github.com/dotnet/aspnetcore - c6865355c01e1fb170b65427846d939559ab3789 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + bb01bbf4433e27289b99001b7de6a582879d1835 - - https://github.com/dotnet/aspnetcore - c6865355c01e1fb170b65427846d939559ab3789 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + bb01bbf4433e27289b99001b7de6a582879d1835 - - https://github.com/dotnet/aspnetcore - c6865355c01e1fb170b65427846d939559ab3789 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + bb01bbf4433e27289b99001b7de6a582879d1835 - - https://github.com/dotnet/aspnetcore - c6865355c01e1fb170b65427846d939559ab3789 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + bb01bbf4433e27289b99001b7de6a582879d1835 - - https://github.com/dotnet/aspnetcore - c6865355c01e1fb170b65427846d939559ab3789 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + bb01bbf4433e27289b99001b7de6a582879d1835 + + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + bb01bbf4433e27289b99001b7de6a582879d1835 https://github.com/dotnet/test-templates @@ -98,44 +98,44 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - - https://github.com/dotnet/sdk - 6772efe6f359786e0350c0f15638d0475c95cba4 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 882a576873b701f79d6584e4a0cf84036fdcd83f - - https://github.com/dotnet/sdk - 6772efe6f359786e0350c0f15638d0475c95cba4 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 882a576873b701f79d6584e4a0cf84036fdcd83f - - https://github.com/dotnet/sdk - 6772efe6f359786e0350c0f15638d0475c95cba4 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 882a576873b701f79d6584e4a0cf84036fdcd83f - - https://github.com/dotnet/sdk - 6772efe6f359786e0350c0f15638d0475c95cba4 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 882a576873b701f79d6584e4a0cf84036fdcd83f - - https://github.com/dotnet/winforms - 631f7cf4c165b3a3da5ab8f8e974a00c0bf067d7 + + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms + e83409daa530605da4eb5f847c6740a520325d25 - - https://github.com/dotnet/wpf - fd949cc0bee03dece87b7430fbba99f150632b9d + + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf + 636e2b7a00a434a354a126f510a56e16ce3c6bbc - + https://github.com/dotnet/fsharp - 5bdd01cf158a4b214f11025fdd45ac7e4774509f + c370ee09c2eebcc750a59e9c10e52792679f896e - + https://github.com/dotnet/fsharp - 5bdd01cf158a4b214f11025fdd45ac7e4774509f + c370ee09c2eebcc750a59e9c10e52792679f896e - + https://github.com/microsoft/vstest - 576a7cc1b259976393cf576a6a9c5df967bb2b7d + c02ece877c62577810f893c44279ce79af820112 @@ -144,32 +144,32 @@ linker - + https://github.com/dotnet/roslyn - a9c49e8b8633005d2d03516693950037a9cf7cc7 + 9e075f038a19d493244bc18997fc52a6c6eefa72 - + https://github.com/dotnet/msbuild - 9e6f1455a81e01cb7780f1e8ed5041f20cd396a3 - + 18d5aef85920037c9d6ff49b1215a4daf515197f + - + https://github.com/nuget/nuget.client - 1a082949ae5b6da7ca2cce047396c53ae1afdde7 + 125f673fd1cdb3cc012f62aa3ce764d2460b89eb https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - daca2015ce74956591df9c9dc7ee732af7863b42 + 6b7d1f47eaaa3f64c95e6f825c9e57debd4c0f31 - + https://github.com/dotnet/emsdk - daca2015ce74956591df9c9dc7ee732af7863b42 + 6b7d1f47eaaa3f64c95e6f825c9e57debd4c0f31 https://github.com/dotnet/deployment-tools @@ -188,18 +188,18 @@ - + https://github.com/dotnet/arcade - 02e28316bf35d1028683ee313f0794776bff18d1 + 3f3c360819c5c092d0e4505a67dfe59a33fba557 - + https://github.com/dotnet/arcade - 02e28316bf35d1028683ee313f0794776bff18d1 + 3f3c360819c5c092d0e4505a67dfe59a33fba557 - + https://github.com/dotnet/arcade - 02e28316bf35d1028683ee313f0794776bff18d1 + 3f3c360819c5c092d0e4505a67dfe59a33fba557 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 2902b1092..31db48967 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,15 +27,15 @@ - 7.0.0-beta.22513.4 + 7.0.0-beta.22558.4 - 7.0.0-rtm.22511.7 + 7.0.0-rtm.22518.7 - 7.0.0-rtm.22511.4 + 7.0.0-rtm.22518.2 @@ -50,44 +50,44 @@ - 7.0.0-rtm.22512.1 - 7.0.0-rtm.22512.1 - 7.0.0-rtm.22512.1 - 7.0.0-rtm.22512.1 - 7.0.0-rtm.22512.1 - 7.0.0-rtm.22512.1 - 7.0.0-rtm.22512.1 + 7.0.0 + 7.0.0 + 7.0.0-rtm.22518.19 + 7.0.0-rtm.22518.19 + 7.0.0-rtm.22518.19 + 7.0.0-rtm.22518.19 + 7.0.0-rtm.22518.19 0.2.0 - 7.0.100-rtm.22512.19 - 7.0.100-rtm.22512.19 - 7.0.100-rtm.22512.19 + 7.0.100 + 7.0.100-rtm.22521.7 + 7.0.100-rtm.22521.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-rtm.22511.4 + 7.0.0 - 7.0.0-rtm.22511.4 - 7.0.0-rtm.22511.4 - 7.0.0-rtm.22511.4 - 7.0.0-rtm.22511.4 - 7.0.0-rtm.22511.4 - 7.0.0-rtm.22511.4 + 7.0.0-rtm.22518.5 + 7.0.0-rtm.22518.5 + 7.0.0 + 7.0.0 + 7.0.0 + 7.0.0 2.1.0 - 7.0.0-rtm.22511.3 - 7.0.0-rtm.22511.3 + 7.0.0-rtm.22519.1 + 7.0.0-rtm.22519.1 7.0.0 7.0.0 @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.4.0-release-20220926-01 + 17.4.0-release-20221019-01 @@ -197,16 +197,16 @@ - 7.0.100-rc.1 - 7.0.0-rc.1.6430 - 33.0.0-rc.1.136 - 15.4.1006-rc.1 - 15.4.1006-rc.1 - 12.3.1006-rc.1 - 15.4.1006-rc.1 + 7.0.100 + 7.0.49 + 33.0.4 + 16.0.1478 + 15.4.2372 + 12.3.2372 + 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.0-rtm.22504.3 - 7.0.0-rtm.22504.3 + 7.0.0 + 7.0.0 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) diff --git a/eng/source-build-tarball-build-official.yml b/eng/source-build-tarball-build-official.yml index 38753d24d..5d396baab 100644 --- a/eng/source-build-tarball-build-official.yml +++ b/eng/source-build-tarball-build-official.yml @@ -10,6 +10,11 @@ resources: - main - release/* - internal/release/* + exclude: + - release/6.0.3xx + - internal/release/6.0.3xx + - release/6.0.4xx + - internal/release/6.0.4xx stages: - build diff --git a/global.json b/global.json index b75566e99..dcb720a56 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.100-rc.2.22477.23", + "dotnet": "7.0.100", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22513.4", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22513.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22558.4", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22558.4" } } diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index 8756b1003..06bfd2b15 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml @@ -76,22 +76,19 @@ jobs: ${{ else }}: ${{ parameters.poolInternalAmd64 }} -- ${{ if eq(variables['System.TeamProject'], 'internal') }}: +- ${{ if and(eq(variables['System.TeamProject'], 'internal'), ne(variables['Build.Reason'], 'PullRequest')) }}: - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml parameters: architecture: arm64 dependsOn: ${{ parameters.dependsOn }} - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: - excludeSdkContentTests: true installerBuildResourceId: ${{ parameters.installerBuildResourceId }} matrix: - ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: - Debian11-Offline: - _BootstrapPrep: true - _Container: ${{ parameters.debian11Arm64Container }} - _EnablePoison: false - _ExcludeOmniSharpTests: false - _RunOnline: false + Debian11-Offline: + _BootstrapPrep: true + _Container: ${{ parameters.debian11Arm64Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: false + _RunOnline: false name: Build_Tarball_arm64 pool: ${{ parameters.poolInternalArm64 }} diff --git a/src/SourceBuild/tarball/content/repos/Directory.Build.targets b/src/SourceBuild/tarball/content/repos/Directory.Build.targets index 9a61647b4..7bf88fdd6 100644 --- a/src/SourceBuild/tarball/content/repos/Directory.Build.targets +++ b/src/SourceBuild/tarball/content/repos/Directory.Build.targets @@ -85,11 +85,11 @@ NewText="/p:RepoRoot="$repo_root/"" /> - + Outputs="$(RepoCompletedSemaphorePath)AddNoWarns.complete" > + CS0618 diff --git a/src/SourceBuild/tarball/content/repos/razor-compiler.proj b/src/SourceBuild/tarball/content/repos/razor-compiler.proj index f47d22c98..a56aa1ea4 100644 --- a/src/SourceBuild/tarball/content/repos/razor-compiler.proj +++ b/src/SourceBuild/tarball/content/repos/razor-compiler.proj @@ -7,6 +7,10 @@ $(ProjectDirectory)global.json $(ProjectDirectory)NuGet.config false + + + NU1507 diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0001-Disable-warning-CS0618.patch b/src/SourceBuild/tarball/patches/aspnetcore/0001-Disable-warning-CS0618.patch deleted file mode 100644 index c2e2eedf7..000000000 --- a/src/SourceBuild/tarball/patches/aspnetcore/0001-Disable-warning-CS0618.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Logan Bussell -Date: Thu, 12 May 2022 14:32:59 -0700 -Subject: [PATCH] Disable warning CS0618 - -This is needed because IOperation.Children is deprecated in -Microsoft.CodeAnalysis 4.3.0, but aspnetcore references version 4.2.0. - -Requires https://github.com/dotnet/source-build/issues/2482 in order to eliminate this patch ---- - .../src/Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/Mvc/Mvc.Api.Analyzers/src/Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj b/src/Mvc/Mvc.Api.Analyzers/src/Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj -index 0b94ad2a8f..1b5cb9d907 100644 ---- a/src/Mvc/Mvc.Api.Analyzers/src/Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj -+++ b/src/Mvc/Mvc.Api.Analyzers/src/Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj -@@ -9,6 +9,7 @@ - false - false - $(MSBuildProjectName).nuspec -+ $(NoWarn);CS0618 - - - diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0001-ResolvePackageFileConflicts-workaround.patch b/src/SourceBuild/tarball/patches/aspnetcore/0001-ResolvePackageFileConflicts-workaround.patch new file mode 100644 index 000000000..ab355630e --- /dev/null +++ b/src/SourceBuild/tarball/patches/aspnetcore/0001-ResolvePackageFileConflicts-workaround.patch @@ -0,0 +1,23 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MichaelSimons +Date: Fri, 11 Nov 2022 21:10:54 +0000 +Subject: [PATCH] ResolvePackageFileConflicts workaround + +--- + .../App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj +index 3b5d2ae950..f92fb421fe 100644 +--- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj ++++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj +@@ -253,6 +253,9 @@ This package is an internal implementation of the .NET Core SDK and is not meant + + + ++ ++ ++ + + + diff --git a/src/SourceBuild/tarball/patches/razor-compiler/0001-Add-NoWarn-for-NU1507.patch b/src/SourceBuild/tarball/patches/razor-compiler/0001-Add-NoWarn-for-NU1507.patch deleted file mode 100644 index d1d297915..000000000 --- a/src/SourceBuild/tarball/patches/razor-compiler/0001-Add-NoWarn-for-NU1507.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Logan Bussell -Date: Fri, 13 May 2022 16:14:14 -0700 -Subject: [PATCH] Add NoWarn for NU1507 - -This warning occurs when using NuGet central package management without defining -any Package Source Mappings. - -Workaround for: https://github.com/dotnet/razor-compiler/issues/242 ---- - Directory.Build.props | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Directory.Build.props b/Directory.Build.props -index a57125f5..019ac376 100644 ---- a/Directory.Build.props -+++ b/Directory.Build.props -@@ -55,6 +55,7 @@ - - $(NoWarn.Replace('1591', '')) - $(NoWarn);0105 -+ $(NoWarn);NU1507 - - - $(WarningsNotAsErrors);CS1591