From 7d9eddf1c0b8a408f0074a7307b4a068e9efec6c Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 18 Oct 2022 15:08:05 +0000 Subject: [PATCH] Merged PR 26816: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 7.0.0 to 7.0.0 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.0-rtm.22511.3 to 7.0.0-rtm.22517.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.0-rtm.22511.3 to 7.0.0-rtm.22517.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 7.0.0-rtm.22511.4 to 7.0.0 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.0-rtm.22511.4 to 7.0.0-rtm.22513.8 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.0-rtm.22511.4 to 7.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.0-rtm.22511.4 to 7.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.0-rtm.22511.4 to 7.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 7.0.0-rtm.22511.4 to 7.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 7.0.0-rtm.22512.1 to 7.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.0-rtm.22512.1 to 7.0.0-rtm.22517.16 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.0-rtm.22512.1 to 7.0.0 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.0-rtm.22512.1 to 7.0.0-rtm.22517.16 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.0-rtm.22512.1 to 7.0.0-rtm.22517.16 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.0-rtm.22512.1 to 7.0.0-rtm.22517.16 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.0-rtm.22512.1 to 7.0.0-rtm.22517.16 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.0 to 7.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.0-rtm.22511.7 to 7.0.0-rtm.22517.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.0 to 7.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.0-rtm.22511.4 to 7.0.0-rtm.22517.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.FSharp.Compiler**: from 12.0.5-beta.22510.6 to 12.4.0-beta.22513.2 (parent: Microsoft.NET.Sdk) - **Microsoft.SourceBuild.Intermediate.fsharp**: from 7.0.0-beta.22510.6 to 7.0.0-beta.22513.2 (... --- NuGet.config | 20 +- eng/Version.Details.xml | 174 +++++++++--------- eng/Versions.props | 46 ++--- .../job/source-build-run-tarball-build.yml | 17 +- 4 files changed, 136 insertions(+), 121 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6d004c295..64e2f1aae 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,8 +6,20 @@ + + + + + + + + + + + + - + @@ -29,9 +41,15 @@ + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f8cfdc859..e86da2f3c 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 + 6bcf305203796b050f9370b14fd305d7f864c7b8 - - https://github.com/dotnet/windowsdesktop - 8a6506751c4e473fb277dd81df3c8ace41a1dfa7 + + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + 6bcf305203796b050f9370b14fd305d7f864c7b8 - - https://github.com/dotnet/windowsdesktop - 8a6506751c4e473fb277dd81df3c8ace41a1dfa7 + + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + 6bcf305203796b050f9370b14fd305d7f864c7b8 - https://github.com/dotnet/windowsdesktop - 8a6506751c4e473fb277dd81df3c8ace41a1dfa7 + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + 6bcf305203796b050f9370b14fd305d7f864c7b8 - - https://github.com/dotnet/runtime - d25158d0dffd699340cedcfd43324c87a809a214 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - - https://github.com/dotnet/runtime - d25158d0dffd699340cedcfd43324c87a809a214 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - - https://github.com/dotnet/runtime - d25158d0dffd699340cedcfd43324c87a809a214 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - - https://github.com/dotnet/runtime - d25158d0dffd699340cedcfd43324c87a809a214 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - - https://github.com/dotnet/runtime - d25158d0dffd699340cedcfd43324c87a809a214 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee - - https://github.com/dotnet/runtime - d25158d0dffd699340cedcfd43324c87a809a214 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + bebb59597c8f98828b4cf2ae7724b277b15c47ee @@ -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 + bebb59597c8f98828b4cf2ae7724b277b15c47ee - - https://github.com/dotnet/aspnetcore - c6865355c01e1fb170b65427846d939559ab3789 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 4b5d52d13a8cf83e13c8f3b1358ddb1d7322722d - - https://github.com/dotnet/aspnetcore - c6865355c01e1fb170b65427846d939559ab3789 - - - https://github.com/dotnet/aspnetcore - c6865355c01e1fb170b65427846d939559ab3789 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 4b5d52d13a8cf83e13c8f3b1358ddb1d7322722d - - https://github.com/dotnet/aspnetcore - c6865355c01e1fb170b65427846d939559ab3789 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 4b5d52d13a8cf83e13c8f3b1358ddb1d7322722d - - https://github.com/dotnet/aspnetcore - c6865355c01e1fb170b65427846d939559ab3789 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 4b5d52d13a8cf83e13c8f3b1358ddb1d7322722d - - https://github.com/dotnet/aspnetcore - c6865355c01e1fb170b65427846d939559ab3789 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 4b5d52d13a8cf83e13c8f3b1358ddb1d7322722d - - https://github.com/dotnet/aspnetcore - c6865355c01e1fb170b65427846d939559ab3789 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 4b5d52d13a8cf83e13c8f3b1358ddb1d7322722d + + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 4b5d52d13a8cf83e13c8f3b1358ddb1d7322722d https://github.com/dotnet/test-templates @@ -98,39 +98,39 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - - https://github.com/dotnet/sdk - 6772efe6f359786e0350c0f15638d0475c95cba4 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 8b26d61dc58ed308926bc4c73949bc7c1613b89f - - https://github.com/dotnet/sdk - 6772efe6f359786e0350c0f15638d0475c95cba4 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 8b26d61dc58ed308926bc4c73949bc7c1613b89f - - https://github.com/dotnet/sdk - 6772efe6f359786e0350c0f15638d0475c95cba4 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 8b26d61dc58ed308926bc4c73949bc7c1613b89f - - https://github.com/dotnet/sdk - 6772efe6f359786e0350c0f15638d0475c95cba4 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 8b26d61dc58ed308926bc4c73949bc7c1613b89f - - https://github.com/dotnet/winforms - 631f7cf4c165b3a3da5ab8f8e974a00c0bf067d7 + + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms + 77b444d039791bf7acf4869f99de695b28d7d6ef - - https://github.com/dotnet/wpf - fd949cc0bee03dece87b7430fbba99f150632b9d + + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf + d8beab3a71f4dab53451bf194f6da7e09dbb43ef - + https://github.com/dotnet/fsharp - 5bdd01cf158a4b214f11025fdd45ac7e4774509f + e142005b5b992da4c04f56bdb287d685da55989c - + https://github.com/dotnet/fsharp - 5bdd01cf158a4b214f11025fdd45ac7e4774509f + e142005b5b992da4c04f56bdb287d685da55989c @@ -144,32 +144,32 @@ linker - + https://github.com/dotnet/roslyn - a9c49e8b8633005d2d03516693950037a9cf7cc7 + 0d6b4d8dcb8fe7a447cfd604d6cbd4d617f7af56 - + https://github.com/dotnet/msbuild - 9e6f1455a81e01cb7780f1e8ed5041f20cd396a3 + 0a4ea3c41cfd6c0c0b86bad45311c40632e4937e - + 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 @@ -201,9 +201,9 @@ https://github.com/dotnet/arcade 02e28316bf35d1028683ee313f0794776bff18d1 - + https://github.com/dotnet/source-build-reference-packages - 8366acfc3e0660ceef6bddbe7794044e5d503521 + fb2dd1b6d4b8809014d2f91e645b683b718419fa diff --git a/eng/Versions.props b/eng/Versions.props index d393c52c1..4cb3d78e0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,11 +31,11 @@ - 7.0.0-rtm.22511.7 + 7.0.0-rtm.22517.2 - 7.0.0-rtm.22511.4 + 7.0.0-rtm.22517.5 @@ -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.22517.16 + 7.0.0-rtm.22517.16 + 7.0.0-rtm.22517.16 + 7.0.0-rtm.22517.16 + 7.0.0-rtm.22517.16 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.22517.33 + 7.0.100-rtm.22517.33 $(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.22513.8 + 7.0.0-rtm.22513.8 + 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.22517.5 + 7.0.0-rtm.22517.5 7.0.0 7.0.0 @@ -205,8 +205,8 @@ 12.3.1006-rc.1 15.4.1006-rc.1 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.0-rtm.22504.3 - 7.0.0-rtm.22504.3 + 7.0.0 + 7.0.0 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) 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 60b39b652..cc8e47e41 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 @@ -70,22 +70,19 @@ jobs: ${{ if eq(variables['System.TeamProject'], 'internal') }}: ${{ 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 }}