Skip to content

Commit e0f81d1

Browse files
author
Jason Zhai
committed
Merge branch 'release/9.0.1xx' of https://github.com/dotnet/sdk into darc-release/9.0.1xx-ab481782-3bc4-46b9-bcbd-0f3a689b48f2
2 parents fd378e1 + 7a28873 commit e0f81d1

File tree

5 files changed

+22
-21
lines changed

5 files changed

+22
-21
lines changed

‎NuGet.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
<add key="darc-pub-dotnet-templating-b1003b4-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-b1003b44-3/nuget/v3/index.json" />
2727
<add key="darc-pub-dotnet-templating-b1003b4-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-b1003b44-2/nuget/v3/index.json" />
2828
<add key="darc-pub-dotnet-templating-b1003b4-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-b1003b44-1/nuget/v3/index.json" />
29+
<add key="darc-pub-dotnet-templating-cdb776d" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-cdb776d3/nuget/v3/index.json" />
2930
<!-- End: Package sources from dotnet-templating -->
3031
<!-- Begin: Package sources from dotnet-windowsdesktop -->
3132
<!-- End: Package sources from dotnet-windowsdesktop -->

‎eng/Version.Details.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="9.0.102">
4+
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="9.0.103">
55
<Uri>https://github.com/dotnet/templating</Uri>
6-
<Sha>b1003b44bf4f77613101b9d31a55bb307515bb6d</Sha>
6+
<Sha>cdb776d3a6988a56a69e9ceb669bf250f51919ee</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="9.0.102-servicing.24576.5">
8+
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="9.0.103-servicing.25057.4">
99
<Uri>https://github.com/dotnet/templating</Uri>
10-
<Sha>b1003b44bf4f77613101b9d31a55bb307515bb6d</Sha>
10+
<Sha>cdb776d3a6988a56a69e9ceb669bf250f51919ee</Sha>
1111
</Dependency>
1212
<!-- Intermediate is necessary for source build. -->
13-
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="9.0.102-servicing.24576.5">
13+
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="9.0.103-servicing.25057.4">
1414
<Uri>https://github.com/dotnet/templating</Uri>
15-
<Sha>b1003b44bf4f77613101b9d31a55bb307515bb6d</Sha>
15+
<Sha>cdb776d3a6988a56a69e9ceb669bf250f51919ee</Sha>
1616
<SourceBuild RepoName="templating" ManagedOnly="true" />
1717
</Dependency>
1818
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0">
@@ -379,14 +379,14 @@
379379
<Uri>https://github.com/dotnet/test-templates</Uri>
380380
<Sha>49c9ad01f057b3c6352bbec12b117acc2224493c</Sha>
381381
</Dependency>
382-
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.9.0" Version="1.1.0-rtm.24605.1">
382+
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.9.0" Version="1.1.0-rtm.24606.1">
383383
<Uri>https://github.com/dotnet/test-templates</Uri>
384-
<Sha>22f4800ed2fe5dbca64c982aa15fd6838016328e</Sha>
384+
<Sha>8d99bca98e3fd0c8f4e10eb200aed20d9665de0e</Sha>
385385
</Dependency>
386386
<!-- Intermediate is necessary for source build. -->
387-
<Dependency Name="Microsoft.SourceBuild.Intermediate.test-templates" Version="1.1.0-rtm.24605.1">
387+
<Dependency Name="Microsoft.SourceBuild.Intermediate.test-templates" Version="1.1.0-rtm.24606.1">
388388
<Uri>https://github.com/dotnet/test-templates</Uri>
389-
<Sha>22f4800ed2fe5dbca64c982aa15fd6838016328e</Sha>
389+
<Sha>8d99bca98e3fd0c8f4e10eb200aed20d9665de0e</Sha>
390390
<SourceBuild RepoName="test-templates" ManagedOnly="true" />
391391
</Dependency>
392392
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
@@ -398,14 +398,14 @@
398398
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
399399
<Sha>a04736acb8edb533756131d3d5fc55f15cd03d6a</Sha>
400400
</Dependency>
401-
<Dependency Name="Microsoft.Web.Xdt" Version="9.0.0-preview.24522.2">
401+
<Dependency Name="Microsoft.Web.Xdt" Version="10.0.0-preview.24609.2">
402402
<Uri>https://github.com/dotnet/xdt</Uri>
403-
<Sha>1a54480f52703fb45fac2a6b955247d33758383e</Sha>
403+
<Sha>63ae81154c50a1cf9287cc47d8351d55b4289e6d</Sha>
404404
</Dependency>
405405
<!-- Intermediate is necessary for source build. -->
406-
<Dependency Name="Microsoft.SourceBuild.Intermediate.xdt" Version="9.0.0-preview.24522.2">
406+
<Dependency Name="Microsoft.SourceBuild.Intermediate.xdt" Version="10.0.0-preview.24609.2">
407407
<Uri>https://github.com/dotnet/xdt</Uri>
408-
<Sha>1a54480f52703fb45fac2a6b955247d33758383e</Sha>
408+
<Sha>63ae81154c50a1cf9287cc47d8351d55b4289e6d</Sha>
409409
<SourceBuild RepoName="xdt" ManagedOnly="true" />
410410
</Dependency>
411411
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0-preview.24605.2">

‎eng/Versions.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<VersionMajor>9</VersionMajor>
77
<VersionMinor>0</VersionMinor>
88
<VersionSDKMinor>1</VersionSDKMinor>
9-
<VersionFeature>02</VersionFeature>
9+
<VersionFeature>03</VersionFeature>
1010
<!-- This property powers the SdkAnalysisLevel property in end-user MSBuild code.
1111
It should always be the hundreds-value of the current SDK version, never any
1212
preview version components or anything else. E.g. 8.0.100, 9.0.300, etc. -->
@@ -46,7 +46,7 @@
4646
<DotNetPrivateAssetRootUrl Condition="'$(DotNetPrivateAssetRootUrl)'==''">https://dotnetclimsrc.blob.core.windows.net/dotnet/</DotNetPrivateAssetRootUrl>
4747
</PropertyGroup>
4848
<PropertyGroup Label="Production dependencies">
49-
<MicrosoftWebXdtPackageVersion>9.0.0-preview.24522.2</MicrosoftWebXdtPackageVersion>
49+
<MicrosoftWebXdtPackageVersion>10.0.0-preview.24609.2</MicrosoftWebXdtPackageVersion>
5050
<MicrosoftCssParserVersion>1.0.0-20230414.1</MicrosoftCssParserVersion>
5151
<MicrosoftApplicationInsightsPackageVersion>2.22.0</MicrosoftApplicationInsightsPackageVersion>
5252
<NETStandardLibraryNETFrameworkVersion>2.0.1-servicing-26011-01</NETStandardLibraryNETFrameworkVersion>
@@ -82,7 +82,7 @@
8282
<PropertyGroup>
8383
<!-- Dependency from https://github.com/dotnet/test-templates -->
8484
<!-- Supported versions -->
85-
<MicrosoftDotNetTestProjectTemplates90PackageVersion>1.1.0-rtm.24605.1</MicrosoftDotNetTestProjectTemplates90PackageVersion>
85+
<MicrosoftDotNetTestProjectTemplates90PackageVersion>1.1.0-rtm.24606.1</MicrosoftDotNetTestProjectTemplates90PackageVersion>
8686
</PropertyGroup>
8787
<PropertyGroup>
8888
<!-- Dependencies from https://github.com/dotnet/runtime -->
@@ -187,13 +187,13 @@
187187
</PropertyGroup>
188188
<PropertyGroup>
189189
<!-- Dependencies from https://github.com/dotnet/templating -->
190-
<MicrosoftTemplateEngineAbstractionsPackageVersion>9.0.102</MicrosoftTemplateEngineAbstractionsPackageVersion>
190+
<MicrosoftTemplateEngineAbstractionsPackageVersion>9.0.103</MicrosoftTemplateEngineAbstractionsPackageVersion>
191191
<MicrosoftTemplateEngineEdgePackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineEdgePackageVersion>
192192
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
193193
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
194194
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
195195
<!-- test dependencies -->
196-
<MicrosoftTemplateEngineMocksPackageVersion>9.0.102-servicing.24576.5</MicrosoftTemplateEngineMocksPackageVersion>
196+
<MicrosoftTemplateEngineMocksPackageVersion>9.0.103-servicing.25057.4</MicrosoftTemplateEngineMocksPackageVersion>
197197
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
198198
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
199199
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>

‎eng/pipelines/templates/jobs/vmr-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ jobs:
227227
228228
if [[ $archiveVersionLine =~ $versionPattern ]]; then
229229
archiveVersion="${BASH_REMATCH[1]}"
230-
archiveUrl="https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-$archiveVersion-${{ parameters.artifactsRid }}.tar.gz"
230+
archiveUrl="https://builds.dotnet.microsoft.com/source-built-artifacts/sdks/dotnet-sdk-$archiveVersion-${{ parameters.artifactsRid }}.tar.gz"
231231
downloadDir="$(sourcesPath)/prereqs/packages/archive/"
232232
233233
echo "Downloading source-built SDK from $archiveUrl..."

‎src/SourceBuild/content/prep-source-build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ function DownloadArchive {
163163
archiveRid=$artifactsRid
164164
fi
165165

166-
archiveUrl="https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.$archiveType.$archiveVersion.$archiveRid.tar.gz"
166+
archiveUrl="https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.$archiveType.$archiveVersion.$archiveRid.tar.gz"
167167

168168
echo " Downloading source-built $archiveType from $archiveUrl..."
169169
(cd "$packagesArchiveDir" && curl -f --retry 5 -O "$archiveUrl")

0 commit comments

Comments
 (0)