diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index 72e5456c973f..1821c0720f99 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -171,7 +171,7 @@ extends:
parameters:
pool:
name: $(DncEngInternalBuildPool)
- image: 1es-ubuntu-2204
+ image: build.azurelinux.3.amd64
os: linux
helixTargetQueue: ubuntu.2204.amd64
oneESCompat:
diff --git a/.vsts-pr.yml b/.vsts-pr.yml
index 86e806989341..f6d89243f71f 100644
--- a/.vsts-pr.yml
+++ b/.vsts-pr.yml
@@ -46,7 +46,7 @@ stages:
parameters:
pool:
name: $(DncEngPublicBuildPool)
- demands: ImageOverride -equals build.ubuntu.2204.amd64.open
+ demands: ImageOverride -equals build.azurelinux.3.amd64.open
os: linux
helixTargetQueue: ubuntu.2204.amd64.open
diff --git a/Directory.Build.props b/Directory.Build.props
index 12041012176f..086936ba742e 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -57,6 +57,11 @@
true
true
+
+
+ true
+ low
+ all
@@ -65,11 +70,6 @@
-
-
- false
-
-
enable
diff --git a/NuGet.config b/NuGet.config
index d9b2cf090a81..0d7b35bf6ded 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -29,8 +29,10 @@
+
+
-
+
@@ -38,7 +40,7 @@
-
+
@@ -65,12 +67,12 @@
+
+
-
-
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index af33e0b12ba4..701b540b2370 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,18 +1,18 @@
-
+
https://github.com/dotnet/templating
- 7a3da726823697767f6664d1386852a31f4d50cc
+ 4d37977dc94f810e840dd0333fa786123189f995
-
+
https://github.com/dotnet/templating
- 7a3da726823697767f6664d1386852a31f4d50cc
+ 4d37977dc94f810e840dd0333fa786123189f995
-
+
https://github.com/dotnet/templating
- 7a3da726823697767f6664d1386852a31f4d50cc
+ b73682307aa0128c5edbec94c2e6a070d13ae6bb
@@ -59,10 +59,6 @@
https://github.com/dotnet/core-setup
7d57652f33493fa022125b7f63aad0d70c52d810
-
- https://github.com/dotnet/emsdk
- 918f4eac9e7d238562abcc364ec417be11b108f0
-
https://github.com/dotnet/emsdk
918f4eac9e7d238562abcc364ec417be11b108f0
@@ -73,67 +69,67 @@
918f4eac9e7d238562abcc364ec417be11b108f0
-
+
https://github.com/dotnet/msbuild
- 07da1b9a89da6d00c5a5a6a385cdcebfdfed7110
+ 2a0eb78b31025538b6e749ecd80dfabfcfa43a42
-
+
https://github.com/dotnet/msbuild
- 07da1b9a89da6d00c5a5a6a385cdcebfdfed7110
+ 2a0eb78b31025538b6e749ecd80dfabfcfa43a42
-
+
https://github.com/dotnet/msbuild
- 07da1b9a89da6d00c5a5a6a385cdcebfdfed7110
+ 2a0eb78b31025538b6e749ecd80dfabfcfa43a42
-
+
https://github.com/dotnet/fsharp
- 47d4e3f91e4e5414b6dafbf14288b9c5a798ef99
+ 14987c804f33917bf15f4c25e0cd16ecd01807f4
-
+
https://github.com/dotnet/fsharp
- 47d4e3f91e4e5414b6dafbf14288b9c5a798ef99
+ 14987c804f33917bf15f4c25e0cd16ecd01807f4
-
+
https://github.com/dotnet/roslyn
- fc52718eccdb37693a40a518b1178b1e23114e68
+ 450493a9b4ec6337bced0120e97cb76f4ed783db
-
+
https://github.com/dotnet/roslyn
- fc52718eccdb37693a40a518b1178b1e23114e68
+ 450493a9b4ec6337bced0120e97cb76f4ed783db
-
+
https://github.com/dotnet/roslyn
- fc52718eccdb37693a40a518b1178b1e23114e68
+ 450493a9b4ec6337bced0120e97cb76f4ed783db
-
+
https://github.com/dotnet/roslyn
- fc52718eccdb37693a40a518b1178b1e23114e68
+ 450493a9b4ec6337bced0120e97cb76f4ed783db
-
+
https://github.com/dotnet/roslyn
- fc52718eccdb37693a40a518b1178b1e23114e68
+ 450493a9b4ec6337bced0120e97cb76f4ed783db
-
+
https://github.com/dotnet/roslyn
- fc52718eccdb37693a40a518b1178b1e23114e68
+ 450493a9b4ec6337bced0120e97cb76f4ed783db
-
+
https://github.com/dotnet/roslyn
- fc52718eccdb37693a40a518b1178b1e23114e68
+ 450493a9b4ec6337bced0120e97cb76f4ed783db
-
+
https://github.com/dotnet/roslyn
- fc52718eccdb37693a40a518b1178b1e23114e68
+ 450493a9b4ec6337bced0120e97cb76f4ed783db
-
+
https://github.com/dotnet/roslyn
- fc52718eccdb37693a40a518b1178b1e23114e68
+ 450493a9b4ec6337bced0120e97cb76f4ed783db
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
@@ -143,91 +139,91 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
324a351f7f1ae6c17b6a8661903e2a7921a7d75c
-
+
https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted
- c92125011405028c945371a89e1a1eb0e735456d
+ 13eeb32d62833984c9367f8f4e22a120ebc03b47
-
+
https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted
- c92125011405028c945371a89e1a1eb0e735456d
+ 13eeb32d62833984c9367f8f4e22a120ebc03b47
-
+
https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted
- c92125011405028c945371a89e1a1eb0e735456d
+ 13eeb32d62833984c9367f8f4e22a120ebc03b47
-
+
https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted
- c92125011405028c945371a89e1a1eb0e735456d
+ 13eeb32d62833984c9367f8f4e22a120ebc03b47
-
+
https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted
- c92125011405028c945371a89e1a1eb0e735456d
+ 13eeb32d62833984c9367f8f4e22a120ebc03b47
-
+
https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted
- c92125011405028c945371a89e1a1eb0e735456d
+ 13eeb32d62833984c9367f8f4e22a120ebc03b47
-
+
https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted
- c92125011405028c945371a89e1a1eb0e735456d
+ 13eeb32d62833984c9367f8f4e22a120ebc03b47
-
+
https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted
- c92125011405028c945371a89e1a1eb0e735456d
+ 13eeb32d62833984c9367f8f4e22a120ebc03b47
-
+
https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted
- c92125011405028c945371a89e1a1eb0e735456d
+ 13eeb32d62833984c9367f8f4e22a120ebc03b47
-
+
https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted
- c92125011405028c945371a89e1a1eb0e735456d
+ 13eeb32d62833984c9367f8f4e22a120ebc03b47
-
+
https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted
- c92125011405028c945371a89e1a1eb0e735456d
+ 13eeb32d62833984c9367f8f4e22a120ebc03b47
-
+
https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted
- c92125011405028c945371a89e1a1eb0e735456d
+ 13eeb32d62833984c9367f8f4e22a120ebc03b47
-
+
https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted
- c92125011405028c945371a89e1a1eb0e735456d
+ 13eeb32d62833984c9367f8f4e22a120ebc03b47
-
+
https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted
- c92125011405028c945371a89e1a1eb0e735456d
+ 13eeb32d62833984c9367f8f4e22a120ebc03b47
-
+
https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted
- c92125011405028c945371a89e1a1eb0e735456d
+ 13eeb32d62833984c9367f8f4e22a120ebc03b47
-
+
https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted
- c92125011405028c945371a89e1a1eb0e735456d
+ 13eeb32d62833984c9367f8f4e22a120ebc03b47
-
+
https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted
- c92125011405028c945371a89e1a1eb0e735456d
+ 13eeb32d62833984c9367f8f4e22a120ebc03b47
-
+
https://github.com/microsoft/vstest
- bc9161306b23641b0364b8f93d546da4d48da1eb
+ 51441adcd6c424ae7315d66ce7e96baf34d70369
-
+
https://github.com/microsoft/vstest
- bc9161306b23641b0364b8f93d546da4d48da1eb
+ 51441adcd6c424ae7315d66ce7e96baf34d70369
-
+
https://github.com/microsoft/vstest
- bc9161306b23641b0364b8f93d546da4d48da1eb
+ 51441adcd6c424ae7315d66ce7e96baf34d70369
-
+
https://github.com/microsoft/vstest
- bc9161306b23641b0364b8f93d546da4d48da1eb
+ 51441adcd6c424ae7315d66ce7e96baf34d70369
@@ -325,22 +321,22 @@
324a351f7f1ae6c17b6a8661903e2a7921a7d75c
-
+
https://github.com/dotnet/razor
- cff92f3cc3f19a607ddbb7a0cddfbccf87a1c061
+ 41f3afd466695ac2460260431537fe4d779ff446
-
+
https://github.com/dotnet/razor
- cff92f3cc3f19a607ddbb7a0cddfbccf87a1c061
+ 41f3afd466695ac2460260431537fe4d779ff446
-
+
https://github.com/dotnet/razor
- cff92f3cc3f19a607ddbb7a0cddfbccf87a1c061
+ 41f3afd466695ac2460260431537fe4d779ff446
-
+
https://github.com/dotnet/razor
- cff92f3cc3f19a607ddbb7a0cddfbccf87a1c061
+ 41f3afd466695ac2460260431537fe4d779ff446
@@ -359,36 +355,6 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
324a351f7f1ae6c17b6a8661903e2a7921a7d75c
-
- https://github.com/dotnet/test-templates
- 0385265f4d0b6413d64aea0223172366a9b9858c
-
-
- https://github.com/dotnet/test-templates
- 307b8f538d83a955d8f6dd909eee41a5555f2f4d
-
-
- https://github.com/dotnet/test-templates
- becc4bd157cd6608b51a5ffe414a5d2de6330272
-
-
- https://github.com/dotnet/test-templates
- becc4bd157cd6608b51a5ffe414a5d2de6330272
-
-
- https://github.com/dotnet/test-templates
- 49c9ad01f057b3c6352bbec12b117acc2224493c
-
-
- https://github.com/dotnet/test-templates
- 47c90e140b027225b799ca8413af10ee3d5f1126
-
-
-
- https://github.com/dotnet/test-templates
- 47c90e140b027225b799ca8413af10ee3d5f1126
-
-
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
@@ -408,18 +374,18 @@
63ae81154c50a1cf9287cc47d8351d55b4289e6d
-
+
https://github.com/dotnet/roslyn-analyzers
- 5ef1abb57ce3df89eae65ecadeb1ddbab323ae05
+ 04fb1b300056f8ef08045c4aed1bbb0a876ea9b8
-
- https://github.com/dotnet/roslyn-analyzers
- 5ef1abb57ce3df89eae65ecadeb1ddbab323ae05
+
+ https://github.com/dotnet/roslyn
+ 450493a9b4ec6337bced0120e97cb76f4ed783db
-
+
https://github.com/dotnet/roslyn-analyzers
- 5ef1abb57ce3df89eae65ecadeb1ddbab323ae05
+ 04fb1b300056f8ef08045c4aed1bbb0a876ea9b8
@@ -445,16 +411,16 @@
-
+
https://github.com/dotnet/source-build-externals
- 16c380d1ce5fa0b24e232251c31cb013bbf3365f
+ 71dbdccd13f28cfd1a35649263b55ebbeab26ee7
-
- https://github.com/dotnet/source-build-assets
- 8e19a1b4f607fcbecc4edbd322d77a60d4e25c3c
-
+
+ https://github.com/dotnet/source-build-reference-packages
+ 6092b62b7f35fddbd6bf31e19b2ab64bbe2443ae
+
https://github.com/dotnet/deployment-tools
diff --git a/eng/Versions.props b/eng/Versions.props
index 70b6f886a7f8..7985982934dd 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -5,8 +5,8 @@
9
0
- 1
- 17
+ 3
+ 14
@@ -18,15 +18,15 @@
true
release
- rtm
+ preview
rtm
servicing
-
-
+ 0
true
+ true
6.0.1
@@ -35,7 +35,7 @@
17
36
20
- $([MSBuild]::Add($(VersionFeature), 10))
+ $([MSBuild]::Add($(VersionFeature), 13))
<_NET70ILLinkPackVersion>7.0.100-1.23211.1
@@ -76,13 +76,12 @@
1.1.0-beta.25317.4
-
- 9.0.15-servicing.26176.1
+
+ 9.1.0-preview.1.24555.3
-
-
- 1.1.0-rtm.25262.1
+
+ 9.0.15-servicing.26176.1
@@ -124,7 +123,10 @@
9.0.15
+ 4.5.1
+ 4.5.5
8.0.5
+ 4.5.4
9.0.15
9.0.15
@@ -137,29 +139,29 @@
- 6.12.5-rc.1
- 6.12.5-rc.1
- 6.12.5-rc.1
- 6.12.5-rc.1
- 6.12.5-rc.1
- 6.12.5-rc.1
- 6.12.5-rc.1
- 6.12.5-rc.1
- 6.12.5-rc.1
- 6.12.5-rc.1
- 6.12.5-rc.1
- 6.12.5-rc.1
+ 6.14.3-rc.1
+ 6.14.3-rc.1
+ 6.14.3-rc.1
+ 6.14.3-rc.1
+ 6.14.3-rc.1
+ 6.14.3-rc.1
+ 6.14.3-rc.1
+ 6.14.3-rc.1
+ 6.14.3-rc.1
+ 6.14.3-rc.1
+ 6.14.3-rc.1
+ 6.14.3-rc.1
- 17.12.0-release-24508-01
- 17.12.0-release-24508-01
- 17.12.0-release-24508-01
+ 17.14.1-release-25428-01
+ 17.14.1-release-25428-01
+ 17.14.1-release-25428-01
- 9.0.0-preview.26075.3
- 3.11.0-beta1.26075.3
+ 9.0.0-preview.26172.3
+ 3.12.0-beta1.26064.1
@@ -170,8 +172,8 @@
Some .NET Framework tasks and the resolver will need to run in a VS/MSBuild that is older
than the very latest, based on what we want the SDK to support. So use a version that matches the version
- in minimumMSBuildVersion. Note that MSBuild has started versioning before release so the version we use as the Minimum should be .0
- to ensure we load in VS but the version we build against should be the version of MSBuild that ships in the .0 VS release.
+ in minimumMSBuildVersion. Note that MSBuild has started versioning before release so the version we use as the Minimum should be .0
+ to ensure we load in VS but the version we build against should be the version of MSBuild that ships in the .0 VS release.
In these cases, we don't want to use MicrosoftBuildVersion and other
associated properties that are updated by the VMR infrastructure. So, we read this version
from the 'minimumMSBuildVersion' file in non-source-only cases into MicrosoftBuildMinimumVersion,
@@ -180,38 +182,38 @@
At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes.
Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent -->
- 17.12.57
- 17.12.57-preview-26069-01
+ 17.14.43
+ 17.14.43-servicing-26070-01
17.11.48
17.12
- 9.0.117
+ 9.0.314
$(MicrosoftTemplateEngineAbstractionsPackageVersion)
$(MicrosoftTemplateEngineAbstractionsPackageVersion)
$(MicrosoftTemplateEngineAbstractionsPackageVersion)
$(MicrosoftTemplateEngineAbstractionsPackageVersion)
- 9.0.117-servicing.26215.7
+ 9.0.314-servicing.26209.3
$(MicrosoftTemplateEngineMocksPackageVersion)
$(MicrosoftTemplateEngineAbstractionsPackageVersion)
$(MicrosoftTemplateEngineMocksPackageVersion)
- 12.9.101-beta.25070.7
+ 13.9.303-beta.25361.1
- 4.12.0-3.25609.5
- 4.12.0-3.25609.5
- 4.12.0-3.25609.5
- 4.12.0-3.25609.5
- 4.12.0-3.25609.5
- 4.12.0-3.25609.5
- 4.12.0-3.25609.5
- 4.12.0-3.25609.5
+ 4.14.0-3.26064.1
+ 4.14.0-3.26064.1
+ 4.14.0-3.26064.1
+ 4.14.0-3.26064.1
+ 4.14.0-3.26064.1
+ 4.14.0-3.26064.1
+ 4.14.0-3.26064.1
+ 4.14.0-3.26064.1
@@ -231,9 +233,9 @@
- 9.0.0-preview.26069.1
- 9.0.0-preview.26069.1
- 9.0.0-preview.26069.1
+ 9.0.0-preview.26064.2
+ 9.0.0-preview.26064.2
+ 9.0.0-preview.26064.2
@@ -317,7 +319,6 @@
15.0.9617
18.0.9617
- 9.0.15-servicing.26175.1
9.0.15
$(MicrosoftNETWorkloadEmscriptenCurrentManifest90100PackageVersion)
diff --git a/eng/pipelines/templates/jobs/vmr-synchronization.yml b/eng/pipelines/templates/jobs/vmr-synchronization.yml
index bb2738990051..105efcd3fffc 100644
--- a/eng/pipelines/templates/jobs/vmr-synchronization.yml
+++ b/eng/pipelines/templates/jobs/vmr-synchronization.yml
@@ -43,11 +43,11 @@ jobs:
pool:
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: $(DncEngPublicBuildPool)
- image: 1es-ubuntu-2204-open
+ image: build.azurelinux.3.amd64.open
os: linux
${{ else }}:
name: $(DncEngInternalBuildPool)
- demands: ImageOverride -equals 1es-ubuntu-2204
+ demands: ImageOverride -equals build.azurelinux.3.amd64
os: linux
steps:
diff --git a/eng/pipelines/templates/variables/vmr-build.yml b/eng/pipelines/templates/variables/vmr-build.yml
index 400defe159a4..ec411f8a7b60 100644
--- a/eng/pipelines/templates/variables/vmr-build.yml
+++ b/eng/pipelines/templates/variables/vmr-build.yml
@@ -81,7 +81,7 @@ variables:
- name: shortStackPoolName
value: NetCore-Public
- name: poolImage_Linux
- value: build.ubuntu.2204.amd64.open
+ value: build.azurelinux.3.amd64.open
- name: poolImage_LinuxArm64
value: Mariner-2-Docker-ARM64
- name: poolName_LinuxArm64
@@ -102,7 +102,7 @@ variables:
- name: shortStackPoolName
value: $(DncEngInternalBuildPool)
- name: poolImage_Linux
- value: build.ubuntu.2204.amd64
+ value: build.azurelinux.3.amd64
- name: poolImage_LinuxArm64
value: build.azurelinux.3.arm64
- name: poolName_LinuxArm64
diff --git a/src/SourceBuild/content/eng/pipelines/source-build-sdk-diff-tests.yml b/src/SourceBuild/content/eng/pipelines/source-build-sdk-diff-tests.yml
index 97ce66882e53..d07e0852da69 100644
--- a/src/SourceBuild/content/eng/pipelines/source-build-sdk-diff-tests.yml
+++ b/src/SourceBuild/content/eng/pipelines/source-build-sdk-diff-tests.yml
@@ -46,7 +46,7 @@ extends:
parameters:
pool:
name: NetCore1ESPool-Svc-Internal
- image: 1es-ubuntu-2204
+ image: build.azurelinux.3.amd64
os: linux
sdl:
sourceAnalysisPool:
diff --git a/src/SourceBuild/content/eng/pipelines/templates/stages/vmr-scan.yml b/src/SourceBuild/content/eng/pipelines/templates/stages/vmr-scan.yml
index 964b84144b3f..519c7e3ee101 100644
--- a/src/SourceBuild/content/eng/pipelines/templates/stages/vmr-scan.yml
+++ b/src/SourceBuild/content/eng/pipelines/templates/stages/vmr-scan.yml
@@ -7,7 +7,7 @@ stages:
displayName: Tag & Scan
pool:
name: $(DncEngInternalBuildPool)
- image: 1es-ubuntu-2204
+ image: build.azurelinux.3.amd64
os: linux
steps:
diff --git a/src/SourceBuild/content/eng/pipelines/vmr-license-scan.yml b/src/SourceBuild/content/eng/pipelines/vmr-license-scan.yml
index fbc44a2d9a9a..2b1604fec65e 100644
--- a/src/SourceBuild/content/eng/pipelines/vmr-license-scan.yml
+++ b/src/SourceBuild/content/eng/pipelines/vmr-license-scan.yml
@@ -54,7 +54,7 @@ extends:
options: '--memory=20g'
pool:
name: NetCore1ESPool-Svc-Internal
- image: 1es-ubuntu-2204
+ image: build.azurelinux.3.amd64
os: linux
sdl:
sourceAnalysisPool:
@@ -150,7 +150,7 @@ extends:
container: licenseScanContainer
pool:
name: NetCore1ESPool-Svc-Internal
- demands: ImageOverride -equals 1es-ubuntu-2204
+ demands: ImageOverride -equals build.azurelinux.3.amd64
timeoutInMinutes: 420
strategy:
matrix: $[ dependencies.Setup.outputs['GetMatrix.matrix'] ]
@@ -224,7 +224,7 @@ extends:
condition: or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release'))
pool:
name: NetCore1ESPool-Svc-Internal
- demands: ImageOverride -equals 1es-ubuntu-2204
+ demands: ImageOverride -equals build.azurelinux.3.amd64
variables:
- template: /eng/pipelines/templates/variables/pipelines.yml@self
steps: