Skip to content

Commit 7de4d07

Browse files
author
Mirroring
committed
Merge commit 'a9eaa1116938d67114f17710785434c21b6122ac'
2 parents 44041dd + a9eaa11 commit 7de4d07

6 files changed

Lines changed: 18 additions & 18 deletions

File tree

eng/Version.Details.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
2323
<Sha>9ecbfd4f3f330dc9649bce49cb12570b19d48c87</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="9.0.0-rtm.25629.1">
25+
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="9.0.0-rtm.26062.4">
2626
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
27-
<Sha>cbd44ea248782625d353211a66c38928861925bf</Sha>
27+
<Sha>fa90dd7db7b98acad5adc1b3e7c6af2bf9c281ba</Sha>
2828
</Dependency>
2929
<Dependency Name="System.Resources.Extensions" Version="9.0.13" CoherentParentDependency="Microsoft.Private.Winforms">
3030
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -165,25 +165,25 @@
165165
</Dependency>
166166
</ProductDependencies>
167167
<ToolsetDependencies>
168-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.26062.2">
168+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.26063.2">
169169
<Uri>https://github.com/dotnet/arcade</Uri>
170-
<Sha>7d6bcdd1e851735273e4eed39e40366d48f335c9</Sha>
170+
<Sha>c85f9aceddaf85296e3efbc463daaa34fef5a375</Sha>
171171
</Dependency>
172-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.26062.2">
172+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.26063.2">
173173
<Uri>https://github.com/dotnet/arcade</Uri>
174-
<Sha>7d6bcdd1e851735273e4eed39e40366d48f335c9</Sha>
174+
<Sha>c85f9aceddaf85296e3efbc463daaa34fef5a375</Sha>
175175
</Dependency>
176-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.26062.2">
176+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.26063.2">
177177
<Uri>https://github.com/dotnet/arcade</Uri>
178-
<Sha>7d6bcdd1e851735273e4eed39e40366d48f335c9</Sha>
178+
<Sha>c85f9aceddaf85296e3efbc463daaa34fef5a375</Sha>
179179
</Dependency>
180180
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="9.0.0-beta.24053.1">
181181
<Uri>https://github.com/dotnet/arcade</Uri>
182182
<Sha>f4e11a15c7b8a949d4a366e792a9843ff6e88cd5</Sha>
183183
</Dependency>
184-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.26062.2">
184+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.26063.2">
185185
<Uri>https://github.com/dotnet/arcade</Uri>
186-
<Sha>7d6bcdd1e851735273e4eed39e40366d48f335c9</Sha>
186+
<Sha>c85f9aceddaf85296e3efbc463daaa34fef5a375</Sha>
187187
</Dependency>
188188
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0-beta.23409.2">
189189
<Uri>https://github.com/dotnet/sourcelink</Uri>

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<!-- Packages that come from https://github.com/dotnet/arcade -->
5353
<PropertyGroup>
5454
<MicrosoftDotNetApiCompatVersion>9.0.0-beta.24053.1</MicrosoftDotNetApiCompatVersion>
55-
<MicrosoftDotNetCodeAnalysisPackageVersion>9.0.0-beta.26062.2</MicrosoftDotNetCodeAnalysisPackageVersion>
55+
<MicrosoftDotNetCodeAnalysisPackageVersion>9.0.0-beta.26063.2</MicrosoftDotNetCodeAnalysisPackageVersion>
5656
</PropertyGroup>
5757
<!-- Sourcelink -->
5858
<PropertyGroup>
@@ -121,6 +121,6 @@
121121
<SystemReflectionMetadataLoadContextPackage>System.Reflection.MetadataLoadContext</SystemReflectionMetadataLoadContextPackage>
122122
</PropertyGroup>
123123
<PropertyGroup>
124-
<MicrosoftDotNetWpfDncEngVersion>9.0.0-rtm.25629.1</MicrosoftDotNetWpfDncEngVersion>
124+
<MicrosoftDotNetWpfDncEngVersion>9.0.0-rtm.26062.4</MicrosoftDotNetWpfDncEngVersion>
125125
</PropertyGroup>
126126
</Project>

eng/common/core-templates/job/publish-build-assets.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
# If it's not devdiv, it's dnceng
7575
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
7676
name: NetCore1ESPool-Publishing-Internal
77-
image: windows.vs2019.amd64
77+
image: windows.vs2022.amd64
7878
os: windows
7979
steps:
8080
- ${{ if eq(parameters.is1ESPipeline, '') }}:

eng/common/core-templates/post-build/post-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -291,11 +291,11 @@ stages:
291291
${{ else }}:
292292
${{ if eq(parameters.is1ESPipeline, true) }}:
293293
name: NetCore1ESPool-Publishing-Internal
294-
image: windows.vs2019.amd64
294+
image: windows.vs2022.amd64
295295
os: windows
296296
${{ else }}:
297297
name: NetCore1ESPool-Publishing-Internal
298-
demands: ImageOverride -equals windows.vs2019.amd64
298+
demands: ImageOverride -equals windows.vs2022.amd64
299299
steps:
300300
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
301301
parameters:

eng/common/templates/variables/pool-providers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#
2424
# pool:
2525
# name: $(DncEngInternalBuildPool)
26-
# demands: ImageOverride -equals windows.vs2019.amd64
26+
# demands: ImageOverride -equals windows.vs2022.amd64
2727
variables:
2828
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
2929
- template: /eng/common/templates-official/variables/pool-providers.yml

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
}
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.26062.2",
16-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.26062.2"
15+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.26063.2",
16+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.26063.2"
1717
},
1818
"sdk": {
1919
"version": "9.0.112"

0 commit comments

Comments
 (0)