Skip to content

Commit 2c88a8c

Browse files
author
Jason Zhai
committed
Merge branch 'release/9.0.3xx' of https://github.com/dotnet/sdk into internal-merge-9.0.3xx-2025-05-13-1502
2 parents f696f0e + ed9bdd5 commit 2c88a8c

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

NuGet.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
<add key="darc-pub-dotnet-templating-bb74178-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-bb741780-3/nuget/v3/index.json" />
5757
<add key="darc-pub-dotnet-templating-bb74178-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-bb741780-2/nuget/v3/index.json" />
5858
<add key="darc-pub-dotnet-templating-bb74178-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-bb741780-1/nuget/v3/index.json" />
59+
<add key="darc-pub-dotnet-templating-a756860" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-a7568602/nuget/v3/index.json" />
5960
<!-- End: Package sources from dotnet-templating -->
6061
<!-- Begin: Package sources from dotnet-windowsdesktop -->
6162
<add key="darc-int-dotnet-windowsdesktop-b141ff4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-b141ff42/nuget/v3/index.json" />

eng/Version.Details.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<ProductDependencies>
44
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="9.0.301">
55
<Uri>https://github.com/dotnet/templating</Uri>
6-
<Sha>8fec3e94610b7f1da0af3aafd5dd83baf7587adb</Sha>
6+
<Sha>a75686022ba3320225ff6c81a47e8cf663fe7441</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="9.0.301-servicing.25257.9">
8+
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="9.0.301-servicing.25264.4">
99
<Uri>https://github.com/dotnet/templating</Uri>
10-
<Sha>8fec3e94610b7f1da0af3aafd5dd83baf7587adb</Sha>
10+
<Sha>a75686022ba3320225ff6c81a47e8cf663fe7441</Sha>
1111
</Dependency>
1212
<!-- Intermediate is necessary for source build. -->
1313
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="9.0.300-preview.25209.5">
@@ -597,14 +597,14 @@
597597
<Uri>https://github.com/dotnet/arcade-services</Uri>
598598
<Sha>47e3672c762970073e4282bd563233da86bcca3e</Sha>
599599
</Dependency>
600-
<Dependency Name="Microsoft.DotNet.ScenarioTests.SdkTemplateTests" Version="9.0.0-preview.25257.1">
600+
<Dependency Name="Microsoft.DotNet.ScenarioTests.SdkTemplateTests" Version="9.0.0-preview.25264.1">
601601
<Uri>https://github.com/dotnet/scenario-tests</Uri>
602-
<Sha>db1f9548f1e32819b3d546faf1ba7d3fa6880ae7</Sha>
602+
<Sha>45b878678cfbde6c460450ed1699de75a20d6e87</Sha>
603603
</Dependency>
604604
<!-- Intermediate is necessary for source build. -->
605-
<Dependency Name="Microsoft.SourceBuild.Intermediate.scenario-tests" Version="9.0.0-preview.25257.1">
605+
<Dependency Name="Microsoft.SourceBuild.Intermediate.scenario-tests" Version="9.0.0-preview.25264.1">
606606
<Uri>https://github.com/dotnet/scenario-tests</Uri>
607-
<Sha>db1f9548f1e32819b3d546faf1ba7d3fa6880ae7</Sha>
607+
<Sha>45b878678cfbde6c460450ed1699de75a20d6e87</Sha>
608608
<SourceBuild RepoName="scenario-tests" ManagedOnly="true" />
609609
</Dependency>
610610
<!--

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@
195195
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
196196
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
197197
<!-- test dependencies -->
198-
<MicrosoftTemplateEngineMocksPackageVersion>9.0.301-servicing.25257.9</MicrosoftTemplateEngineMocksPackageVersion>
198+
<MicrosoftTemplateEngineMocksPackageVersion>9.0.301-servicing.25264.4</MicrosoftTemplateEngineMocksPackageVersion>
199199
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
200200
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
201201
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>
@@ -263,7 +263,7 @@
263263
<PropertyGroup Label="Infrastructure and test only dependencies">
264264
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
265265
<DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
266-
<MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>9.0.0-preview.25257.1</MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>
266+
<MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>9.0.0-preview.25264.1</MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>
267267
</PropertyGroup>
268268
<PropertyGroup Label="Manually updated">
269269
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->

src/SourceBuild/content/eng/pipelines/sb-ci.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@ trigger:
88
batch: true
99
branches:
1010
include:
11-
- main
12-
- release/*
13-
- internal/release/*
11+
- release/9.0.1xx
12+
- internal/release/9.0.1xx
1413

1514
variables:
1615
# enable source-only build for pipelines that contain the -source-build string

0 commit comments

Comments
 (0)