diff --git a/NuGet.config b/NuGet.config index cd4f6e61cf2..ebbe73ce4c4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,18 +5,10 @@ - - - - - + - - - - - + @@ -30,18 +22,10 @@ - - - - - + - - - - - + diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d735ec5d847..4e2e668cf90 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -47,7 +47,7 @@ resources: - repository: 1ESPipelineTemplates type: git name: 1ESPipelineTemplates/1ESPipelineTemplates - ref: refs/tags/release + ref: refs/tags/release-2025-07-08-1 extends: template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates parameters: diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d185800cd5d..d8381b76164 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 92d43c655032c60ddf0b3727041e05c93055ee97 + 1957eae58462d524ab5ba1ee3b335405082dc05f - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 92d43c655032c60ddf0b3727041e05c93055ee97 + 1957eae58462d524ab5ba1ee3b335405082dc05f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -17,9 +17,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ef853a71052646a42abf17e888ec6d9a69614ad9 + fce8ed90dc43047eabec2b32c04ee46b789ad5d1 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int @@ -29,17 +29,17 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ef853a71052646a42abf17e888ec6d9a69614ad9 + fce8ed90dc43047eabec2b32c04ee46b789ad5d1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ef853a71052646a42abf17e888ec6d9a69614ad9 + fce8ed90dc43047eabec2b32c04ee46b789ad5d1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ef853a71052646a42abf17e888ec6d9a69614ad9 + fce8ed90dc43047eabec2b32c04ee46b789ad5d1 @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 92d43c655032c60ddf0b3727041e05c93055ee97 + 1957eae58462d524ab5ba1ee3b335405082dc05f diff --git a/eng/Versions.props b/eng/Versions.props index 3972c2a22d8..d1532fe5366 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -22,18 +22,18 @@ - 8.0.18-servicing.25312.3 + 8.0.19-servicing.25367.3 - 8.0.18-servicing.25311.17 - 8.0.18 - 8.0.18 - 8.0.18-servicing.25311.17 + 8.0.19-servicing.25365.14 + 8.0.19 + 8.0.19 + 8.0.19-servicing.25365.14 8.0.0 8.0.1 8.0.2 - 8.0.18 + 8.0.19 8.0.0 8.0.1 8.0.1 diff --git a/eng/pipeline.yml b/eng/pipeline.yml index 3f1bf604e2c..7748d77a593 100644 --- a/eng/pipeline.yml +++ b/eng/pipeline.yml @@ -27,10 +27,10 @@ jobs: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: NetCore-Public - demands: ImageOverride -equals windows.vs2022preview.amd64.Open + demands: ImageOverride -equals windows.vs2022.amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals windows.vs2022preview.amd64 + demands: ImageOverride -equals windows.vs2022.amd64 helixRepo: $(repoName) jobs: - job: Windows_NT @@ -41,10 +41,10 @@ jobs: # agent pool can't be read from a user-defined variable (Azure DevOps limitation) ${{ if eq(variables['System.TeamProject'], 'public') }}: name: NetCore-Public - demands: ImageOverride -equals windows.vs2022preview.amd64.Open + demands: ImageOverride -equals windows.vs2022.amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals windows.vs2022preview.amd64 + demands: ImageOverride -equals windows.vs2022.amd64 variables: - name: Codeql.Enabled value: true