diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 839889b3e33d..01899e0799c4 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -59,6 +59,15 @@ extends: ${{ else }}: template: v1/1ES.Unofficial.PipelineTemplate.yml@1esPipelines parameters: + ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: + settings: + networkIsolationPolicy: Permissive,CFSClean,CFSClean2,CFSClean3 + ${{ else }}: + # Internal PR builds run under the 1ES Unofficial template. They restore from + # public feeds (nuget.org, npm, yarn), so network isolation is not applicable + # and is disabled to avoid spurious CFS clean violations. + settings: + networkIsolationMode: None sdl: sourceAnalysisPool: name: $(DncEngInternalBuildPool) diff --git a/NuGet.config b/NuGet.config index d55d97de64fe..a43d19994451 100644 --- a/NuGet.config +++ b/NuGet.config @@ -1,30 +1,28 @@ + - - + - - - - + - + + @@ -48,18 +46,16 @@ - - + - - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 305aeb7e0972..5d105252a69c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/templating - 889b459499e9518b34b926cf423ac9a78429bcc3 + 582216c8db382a998f79e63ca8996641a8f9c29b - + https://github.com/dotnet/templating - 889b459499e9518b34b926cf423ac9a78429bcc3 + 582216c8db382a998f79e63ca8996641a8f9c29b - + https://github.com/dotnet/templating - 889b459499e9518b34b926cf423ac9a78429bcc3 + 582216c8db382a998f79e63ca8996641a8f9c29b @@ -55,61 +55,61 @@ https://github.com/dotnet/emsdk 35ebe6f3e6953f878ed92f637ad8d7f27202f7a6 - - https://github.com/dotnet/msbuild - 7806cbf7b0fd91ea6ab55c2e42d8ed973114e197 + + https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted + 02bf66295b64ab368d12933041f7281aad186a2d - - https://github.com/dotnet/msbuild - 7806cbf7b0fd91ea6ab55c2e42d8ed973114e197 + + https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted + 02bf66295b64ab368d12933041f7281aad186a2d - - https://github.com/dotnet/msbuild - 7806cbf7b0fd91ea6ab55c2e42d8ed973114e197 + + https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted + 02bf66295b64ab368d12933041f7281aad186a2d - + https://github.com/dotnet/fsharp - fc5e9eda234e2b69aa479f4f83faddc31fdd4da7 + e11d7079bebc6f101c5313fe0d1de9e3d38a7c02 - + https://github.com/dotnet/fsharp - fc5e9eda234e2b69aa479f4f83faddc31fdd4da7 + e11d7079bebc6f101c5313fe0d1de9e3d38a7c02 - + https://github.com/dotnet/format - a8be5ff9c558f921f565c461dd7688905f84742a + 6eca172fd9205e0275d2d88bebe1e4f4fbb173d4 - + https://github.com/dotnet/roslyn - 38896ab4e7cee896fcde8a4e26914a777c794e3b + 3fb752d448006a3144a60ccf181d745e555422f9 - + https://github.com/dotnet/roslyn - 38896ab4e7cee896fcde8a4e26914a777c794e3b + 3fb752d448006a3144a60ccf181d745e555422f9 - + https://github.com/dotnet/roslyn - 38896ab4e7cee896fcde8a4e26914a777c794e3b + 3fb752d448006a3144a60ccf181d745e555422f9 - + https://github.com/dotnet/roslyn - 38896ab4e7cee896fcde8a4e26914a777c794e3b + 3fb752d448006a3144a60ccf181d745e555422f9 - + https://github.com/dotnet/roslyn - 38896ab4e7cee896fcde8a4e26914a777c794e3b + 3fb752d448006a3144a60ccf181d745e555422f9 - + https://github.com/dotnet/roslyn - 38896ab4e7cee896fcde8a4e26914a777c794e3b + 3fb752d448006a3144a60ccf181d745e555422f9 - + https://github.com/dotnet/roslyn - 38896ab4e7cee896fcde8a4e26914a777c794e3b + 3fb752d448006a3144a60ccf181d745e555422f9 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -119,86 +119,86 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore bb9eccba9080e07bce32c0bc27c3564c753a7cfe - + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - 60584b9c2451c0e324655f3968bc4ed1a1a8c85c + c754078ce0c9bba2fc03aa6fd45c1fd760c25a62 - + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - 60584b9c2451c0e324655f3968bc4ed1a1a8c85c + c754078ce0c9bba2fc03aa6fd45c1fd760c25a62 - + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - 60584b9c2451c0e324655f3968bc4ed1a1a8c85c + c754078ce0c9bba2fc03aa6fd45c1fd760c25a62 - + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - 60584b9c2451c0e324655f3968bc4ed1a1a8c85c + c754078ce0c9bba2fc03aa6fd45c1fd760c25a62 - + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - 60584b9c2451c0e324655f3968bc4ed1a1a8c85c + c754078ce0c9bba2fc03aa6fd45c1fd760c25a62 - + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - 60584b9c2451c0e324655f3968bc4ed1a1a8c85c + c754078ce0c9bba2fc03aa6fd45c1fd760c25a62 - + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - 60584b9c2451c0e324655f3968bc4ed1a1a8c85c + c754078ce0c9bba2fc03aa6fd45c1fd760c25a62 - + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - 60584b9c2451c0e324655f3968bc4ed1a1a8c85c + c754078ce0c9bba2fc03aa6fd45c1fd760c25a62 - + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - 60584b9c2451c0e324655f3968bc4ed1a1a8c85c + c754078ce0c9bba2fc03aa6fd45c1fd760c25a62 - + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - 60584b9c2451c0e324655f3968bc4ed1a1a8c85c + c754078ce0c9bba2fc03aa6fd45c1fd760c25a62 - + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - 60584b9c2451c0e324655f3968bc4ed1a1a8c85c + c754078ce0c9bba2fc03aa6fd45c1fd760c25a62 - + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - 60584b9c2451c0e324655f3968bc4ed1a1a8c85c + c754078ce0c9bba2fc03aa6fd45c1fd760c25a62 - + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - 60584b9c2451c0e324655f3968bc4ed1a1a8c85c + c754078ce0c9bba2fc03aa6fd45c1fd760c25a62 - + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - 60584b9c2451c0e324655f3968bc4ed1a1a8c85c + c754078ce0c9bba2fc03aa6fd45c1fd760c25a62 - + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - 60584b9c2451c0e324655f3968bc4ed1a1a8c85c + c754078ce0c9bba2fc03aa6fd45c1fd760c25a62 - + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - 60584b9c2451c0e324655f3968bc4ed1a1a8c85c + c754078ce0c9bba2fc03aa6fd45c1fd760c25a62 - + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - 60584b9c2451c0e324655f3968bc4ed1a1a8c85c + c754078ce0c9bba2fc03aa6fd45c1fd760c25a62 - + https://github.com/microsoft/vstest - aa59400b11e1aeee2e8af48928dbd48748a8bef9 + 7855c9b221686104532ebf3380f2d45b3613b369 - + https://github.com/microsoft/vstest - aa59400b11e1aeee2e8af48928dbd48748a8bef9 + 7855c9b221686104532ebf3380f2d45b3613b369 - + https://github.com/microsoft/vstest - aa59400b11e1aeee2e8af48928dbd48748a8bef9 + 7855c9b221686104532ebf3380f2d45b3613b369 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -293,18 +293,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore bb9eccba9080e07bce32c0bc27c3564c753a7cfe - + https://github.com/dotnet/razor - e137c0322ddb9e3d4f4a5de385647baa9719f9a6 + 2f31e7f15e35ce060c1ba81174a87fdd0ae9f479 - + https://github.com/dotnet/razor - e137c0322ddb9e3d4f4a5de385647baa9719f9a6 + 2f31e7f15e35ce060c1ba81174a87fdd0ae9f479 - + https://github.com/dotnet/razor - e137c0322ddb9e3d4f4a5de385647baa9719f9a6 + 2f31e7f15e35ce060c1ba81174a87fdd0ae9f479 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -327,17 +327,17 @@ 9a1c3e1b7f0c8763d4c96e593961a61a72679a7b - + https://github.com/dotnet/roslyn-analyzers - 0963af6bfc2a3d5083faa2b7c1c91a4eee29a6f4 + abef8ced132657943b7150f01a308e2199a17d5d - + https://github.com/dotnet/roslyn-analyzers - 0963af6bfc2a3d5083faa2b7c1c91a4eee29a6f4 + abef8ced132657943b7150f01a308e2199a17d5d - + https://github.com/dotnet/roslyn-analyzers - 0963af6bfc2a3d5083faa2b7c1c91a4eee29a6f4 + abef8ced132657943b7150f01a308e2199a17d5d @@ -354,10 +354,10 @@ f537cc21040df4a14d26a3045a0d4b6fdc1efc3b - - https://github.com/dotnet/source-build-assets - 2bb24ee4d15de5a4550abed0265ca9e0ef0beae3 - + + https://github.com/dotnet/source-build-reference-packages + 9d83c59ff890ff2020aa38ebcf3bb514e38e9ffe + https://github.com/dotnet/deployment-tools @@ -469,9 +469,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - e4ede9b8979b9d2b1b1d4383f30a791414f0625b + fdc20074cf1e48b8cf11fe6ac78f255b1fbfe611 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 826c1cd7a205..c77d57cb6e9d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,12 +11,13 @@ - 8.0.130 + 8.0.424 + 8.0.400 true release - rtm + preview rtm servicing @@ -30,10 +31,11 @@ 2.0.1-servicing-26011-01 2.0.3 13.0.3 + 4.8.6 1.2.0-beta.435 - 7.0.0 + 8.0.0 4.0.0 - 7.0.0 + 8.0.1 8.0.0-beta.26278.3 7.0.0-preview.22423.2 8.0.0 @@ -57,6 +59,7 @@ 8.0.28 8.0.28-servicing.26264.13 8.0.0 + $(MicrosoftExtensionsDependencyModelPackageVersion) 8.0.1 8.0.3 8.0.1 @@ -72,7 +75,7 @@ 8.0.0 8.0.2 8.0.1 - 8.0.0 + 8.0.7 8.0.1 8.0.3 8.0.0 @@ -85,26 +88,26 @@ - 6.8.2-rc.3 - 6.8.2-rc.3 - 6.8.2-rc.3 - 6.8.2-rc.3 - 6.8.2-rc.3 - 6.8.2-rc.3 - 6.8.2-rc.3 - 6.8.2-rc.3 - 6.8.2-rc.3 - 6.8.2-rc.3 - 6.8.2-rc.3 - 6.8.2-rc.3 + 6.11.2-rc.1 + 6.11.2-rc.1 + 6.11.2-rc.1 + 6.11.2-rc.1 + 6.11.2-rc.1 + 6.11.2-rc.1 + 6.11.2-rc.1 + 6.11.2-rc.1 + 6.11.2-rc.1 + 6.11.2-rc.1 + 6.11.2-rc.1 + 6.11.2-rc.1 $(NuGetPackagingPackageVersion) $(NuGetProjectModelPackageVersion) - 17.8.0-release-23615-02 - 17.8.0-release-23615-02 - 17.8.0-release-23615-02 + 17.11.1-release-24455-02 + 17.11.1-release-24455-02 + 17.11.1-release-24455-02 @@ -114,58 +117,56 @@ - 8.1.657407 + 8.3.731007 - 8.0.0-preview.26274.2 - 3.11.0-beta1.26274.2 + 8.0.0-preview.23614.1 + 3.11.0-beta1.23614.1 - 17.8.49 + 17.11.48 $(MicrosoftBuildPackageVersion) - $(MicrosoftBuildPackageVersion) - $(MicrosoftBuildPackageVersion) - 17.8.49-servicing-25616-08 - $(MicrosoftBuildPackageVersion) - $(MicrosoftBuildPackageVersion) + This avoids the need to juggle references to packages that have been updated in newer MSBuild. --> + 17.8.43 + $(MicrosoftBuildMinimumVersion) + $(MicrosoftBuildMinimumVersion) + 17.11.48-servicing-25466-05 + $(MicrosoftBuildMinimumVersion) + $(MicrosoftBuildMinimumVersion) $(MicrosoftBuildTasksCorePackageVersion) + $(MicrosoftBuildMinimumVersion) - 8.0.129 + 8.0.423 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.129-servicing.26302.7 + 8.0.423-servicing.26302.9 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) - 12.8.102-beta.24081.2 + 12.8.403-beta.24526.2 - 4.8.0-7.25569.25 - 4.8.0-7.25569.25 - 4.8.0-7.25569.25 - 4.8.0-7.25569.25 - 4.8.0-7.25569.25 - 4.8.0-7.25569.25 - 4.8.0-7.25569.25 + 4.11.0-3.25569.22 + 4.11.0-3.25569.22 + 4.11.0-3.25569.22 + 4.11.0-3.25569.22 + 4.11.0-3.25569.22 + 4.11.0-3.25569.22 + 4.11.0-3.25569.22 $(MicrosoftNetCompilersToolsetPackageVersion) @@ -180,9 +181,9 @@ - 7.0.0-preview.26064.3 - 7.0.0-preview.26064.3 - 7.0.0-preview.26064.3 + 9.0.0-preview.26227.1 + 9.0.0-preview.26227.1 + 9.0.0-preview.26227.1