Skip to content

Commit 0895d16

Browse files
author
Jason Zhai
committed
Merge branch 'release/9.0.3xx' of https://github.com/dotnet/sdk into darc-release/9.0.3xx-92e9048c-bb40-48d4-92f8-d9def84ccc5d
2 parents ccd103e + dba211b commit 0895d16

File tree

4 files changed

+23
-23
lines changed

4 files changed

+23
-23
lines changed

.vsts-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ extends:
272272
name: Azure Pipelines
273273
image: macOS-latest
274274
os: macOS
275-
helixTargetQueue: osx.13.amd64
275+
helixTargetQueue: osx.15.amd64
276276
oneESCompat:
277277
templateFolderName: templates-official
278278
publishTaskPrefix: 1ES.
@@ -300,7 +300,7 @@ extends:
300300
name: Azure Pipelines
301301
vmImage: macOS-latest
302302
os: macOS
303-
helixTargetQueue: osx.13.arm64
303+
helixTargetQueue: osx.15.arm64
304304
macOSJobParameterSets:
305305
- categoryName: TestBuild
306306
buildArchitecture: arm64

.vsts-pr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ stages:
6363
name: Azure Pipelines
6464
vmImage: macOS-latest
6565
os: macOS
66-
helixTargetQueue: osx.13.amd64.open
66+
helixTargetQueue: osx.15.amd64.open
6767
### ARM64 ###
6868
- ${{ if eq(parameters.enableArm64Job, true) }}:
6969
- template: /eng/pipelines/templates/jobs/sdk-job-matrix.yml
@@ -72,7 +72,7 @@ stages:
7272
name: Azure Pipelines
7373
vmImage: macOS-latest
7474
os: macOS
75-
helixTargetQueue: osx.13.arm64.open
75+
helixTargetQueue: osx.15.arm64.open
7676
macOSJobParameterSets:
7777
- categoryName: TestBuild
7878
buildArchitecture: arm64

eng/Version.Details.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -69,18 +69,18 @@
6969
<Sha>dad5528e5bdf92a05a5a404c5f7939523390b96d</Sha>
7070
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
7171
</Dependency>
72-
<Dependency Name="Microsoft.Build" Version="17.14.0-preview-25167-12">
72+
<Dependency Name="Microsoft.Build" Version="17.14.0-preview-25175-08">
7373
<Uri>https://github.com/dotnet/msbuild</Uri>
74-
<Sha>1b376b0e538c4906083d69533dae9a7a95379163</Sha>
74+
<Sha>5880e1c759c6ae76e32729ae4b884d9afe1fbf64</Sha>
7575
</Dependency>
76-
<Dependency Name="Microsoft.Build.Localization" Version="17.14.0-preview-25167-12">
76+
<Dependency Name="Microsoft.Build.Localization" Version="17.14.0-preview-25175-08">
7777
<Uri>https://github.com/dotnet/msbuild</Uri>
78-
<Sha>1b376b0e538c4906083d69533dae9a7a95379163</Sha>
78+
<Sha>5880e1c759c6ae76e32729ae4b884d9afe1fbf64</Sha>
7979
</Dependency>
8080
<!-- Intermediate is necessary for source build. -->
81-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.14.0-preview-25167-12">
81+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.14.0-preview-25175-08">
8282
<Uri>https://github.com/dotnet/msbuild</Uri>
83-
<Sha>1b376b0e538c4906083d69533dae9a7a95379163</Sha>
83+
<Sha>5880e1c759c6ae76e32729ae4b884d9afe1fbf64</Sha>
8484
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
8585
</Dependency>
8686
<Dependency Name="Microsoft.FSharp.Compiler" Version="13.9.300-beta.25160.5">
@@ -208,22 +208,22 @@
208208
<Uri>https://github.com/nuget/nuget.client</Uri>
209209
<Sha>c4b26195ee5a77e70b2ea5fd50db87d6a9194c24</Sha>
210210
</Dependency>
211-
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.14.0-preview-25167-01">
211+
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.14.0-preview-25175-02">
212212
<Uri>https://github.com/microsoft/vstest</Uri>
213-
<Sha>ce9daafcdff093c9480f0d0b372cbcdef434abb5</Sha>
213+
<Sha>782a46231902762286f6958631437d635bfdd249</Sha>
214214
</Dependency>
215-
<Dependency Name="Microsoft.TestPlatform.CLI" Version="17.14.0-preview-25167-01">
215+
<Dependency Name="Microsoft.TestPlatform.CLI" Version="17.14.0-preview-25175-02">
216216
<Uri>https://github.com/microsoft/vstest</Uri>
217-
<Sha>ce9daafcdff093c9480f0d0b372cbcdef434abb5</Sha>
217+
<Sha>782a46231902762286f6958631437d635bfdd249</Sha>
218218
</Dependency>
219-
<Dependency Name="Microsoft.TestPlatform.Build" Version="17.14.0-preview-25167-01">
219+
<Dependency Name="Microsoft.TestPlatform.Build" Version="17.14.0-preview-25175-02">
220220
<Uri>https://github.com/microsoft/vstest</Uri>
221-
<Sha>ce9daafcdff093c9480f0d0b372cbcdef434abb5</Sha>
221+
<Sha>782a46231902762286f6958631437d635bfdd249</Sha>
222222
</Dependency>
223223
<!-- Intermediate is necessary for source build. -->
224-
<Dependency Name="Microsoft.SourceBuild.Intermediate.vstest" Version="17.14.0-preview-25167-01">
224+
<Dependency Name="Microsoft.SourceBuild.Intermediate.vstest" Version="17.14.0-preview-25175-02">
225225
<Uri>https://github.com/microsoft/vstest</Uri>
226-
<Sha>ce9daafcdff093c9480f0d0b372cbcdef434abb5</Sha>
226+
<Sha>782a46231902762286f6958631437d635bfdd249</Sha>
227227
<SourceBuild RepoName="vstest" ManagedOnly="true" />
228228
</Dependency>
229229
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.3">

eng/Versions.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -151,9 +151,9 @@
151151
</PropertyGroup>
152152
<PropertyGroup>
153153
<!-- Dependencies from https://github.com/Microsoft/vstest -->
154-
<MicrosoftNETTestSdkPackageVersion>17.14.0-preview-25167-01</MicrosoftNETTestSdkPackageVersion>
155-
<MicrosoftTestPlatformCLIPackageVersion>17.14.0-preview-25167-01</MicrosoftTestPlatformCLIPackageVersion>
156-
<MicrosoftTestPlatformBuildPackageVersion>17.14.0-preview-25167-01</MicrosoftTestPlatformBuildPackageVersion>
154+
<MicrosoftNETTestSdkPackageVersion>17.14.0-preview-25175-02</MicrosoftNETTestSdkPackageVersion>
155+
<MicrosoftTestPlatformCLIPackageVersion>17.14.0-preview-25175-02</MicrosoftTestPlatformCLIPackageVersion>
156+
<MicrosoftTestPlatformBuildPackageVersion>17.14.0-preview-25175-02</MicrosoftTestPlatformBuildPackageVersion>
157157
</PropertyGroup>
158158
<PropertyGroup>
159159
<!-- Dependencies from https://github.com/dotnet/roslyn-analyzers -->
@@ -179,8 +179,8 @@
179179
At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes.
180180
181181
Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent -->
182-
<MicrosoftBuildVersion>17.14.0-preview-25167-12</MicrosoftBuildVersion>
183-
<MicrosoftBuildLocalizationVersion>17.14.0-preview-25167-12</MicrosoftBuildLocalizationVersion>
182+
<MicrosoftBuildVersion>17.14.0-preview-25175-08</MicrosoftBuildVersion>
183+
<MicrosoftBuildLocalizationVersion>17.14.0-preview-25175-08</MicrosoftBuildLocalizationVersion>
184184
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.11.4</MicrosoftBuildMinimumVersion>
185185
<MinimumVSVersion>17.12</MinimumVSVersion>
186186
</PropertyGroup>

0 commit comments

Comments
 (0)