Skip to content

Commit 286b77c

Browse files
author
Jason Zhai
committed
Merge branch 'release/9.0.1xx' of https://github.com/dotnet/sdk into darc-release/9.0.1xx-0d6e1dd3-07ee-40be-8edf-ab81a1bb633d
2 parents c9e707d + 197f6da commit 286b77c

File tree

5 files changed

+37
-41
lines changed

5 files changed

+37
-41
lines changed

‎NuGet.config

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-deployment-tools -->
77
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5/nuget/v3/index.json" />
8+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-4/nuget/v3/index.json" />
9+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-3/nuget/v3/index.json" />
10+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-2/nuget/v3/index.json" />
811
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-9/nuget/v3/index.json" />
912
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-8/nuget/v3/index.json" />
1013
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-7/nuget/v3/index.json" />
@@ -57,6 +60,9 @@
5760
<!-- End: Package sources from dotnet-runtime -->
5861
<!-- Begin: Package sources from dotnet-templating -->
5962
<add key="darc-pub-dotnet-templating-f46c70a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab/nuget/v3/index.json" />
63+
<add key="darc-pub-dotnet-templating-f46c70a-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-4/nuget/v3/index.json" />
64+
<add key="darc-pub-dotnet-templating-f46c70a-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-3/nuget/v3/index.json" />
65+
<add key="darc-pub-dotnet-templating-f46c70a-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-2/nuget/v3/index.json" />
6066
<add key="darc-pub-dotnet-templating-f46c70a-9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-9/nuget/v3/index.json" />
6167
<add key="darc-pub-dotnet-templating-f46c70a-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-8/nuget/v3/index.json" />
6268
<add key="darc-pub-dotnet-templating-f46c70a-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-7/nuget/v3/index.json" />

‎eng/Version.Details.xml

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -325,22 +325,22 @@
325325
<Sha>4442a188f9200a57635373dcd640893c0e8dcc78</Sha>
326326
<SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
327327
</Dependency>
328-
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="9.0.0-preview.24616.4">
328+
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="9.0.0-preview.25104.3">
329329
<Uri>https://github.com/dotnet/razor</Uri>
330-
<Sha>e0c5e5892684a5ce8f4fa0dcc504a0af4c140ac7</Sha>
330+
<Sha>36abdce12db3b9c9360e8c7711d489204a4eac71</Sha>
331331
</Dependency>
332-
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="9.0.0-preview.24616.4">
332+
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="9.0.0-preview.25104.3">
333333
<Uri>https://github.com/dotnet/razor</Uri>
334-
<Sha>e0c5e5892684a5ce8f4fa0dcc504a0af4c140ac7</Sha>
334+
<Sha>36abdce12db3b9c9360e8c7711d489204a4eac71</Sha>
335335
</Dependency>
336-
<Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="9.0.0-preview.24616.4">
336+
<Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="9.0.0-preview.25104.3">
337337
<Uri>https://github.com/dotnet/razor</Uri>
338-
<Sha>e0c5e5892684a5ce8f4fa0dcc504a0af4c140ac7</Sha>
338+
<Sha>36abdce12db3b9c9360e8c7711d489204a4eac71</Sha>
339339
</Dependency>
340340
<!-- Intermediate is necessary for source build. -->
341-
<Dependency Name="Microsoft.SourceBuild.Intermediate.razor" Version="9.0.0-preview.24616.4">
341+
<Dependency Name="Microsoft.SourceBuild.Intermediate.razor" Version="9.0.0-preview.25104.3">
342342
<Uri>https://github.com/dotnet/razor</Uri>
343-
<Sha>e0c5e5892684a5ce8f4fa0dcc504a0af4c140ac7</Sha>
343+
<Sha>36abdce12db3b9c9360e8c7711d489204a4eac71</Sha>
344344
<SourceBuild RepoName="razor" ManagedOnly="true" />
345345
</Dependency>
346346
<Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.1">
@@ -589,34 +589,34 @@
589589
</Dependency>
590590
</ProductDependencies>
591591
<ToolsetDependencies>
592-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25065.2">
592+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25077.4">
593593
<Uri>https://github.com/dotnet/arcade</Uri>
594-
<Sha>c4bbc67763bf0c5a868862df874079380e647d61</Sha>
594+
<Sha>bac7e1caea791275b7c3ccb4cb75fd6a04a26618</Sha>
595595
</Dependency>
596-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25065.2">
596+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25077.4">
597597
<Uri>https://github.com/dotnet/arcade</Uri>
598-
<Sha>c4bbc67763bf0c5a868862df874079380e647d61</Sha>
598+
<Sha>bac7e1caea791275b7c3ccb4cb75fd6a04a26618</Sha>
599599
</Dependency>
600-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25065.2">
600+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25077.4">
601601
<Uri>https://github.com/dotnet/arcade</Uri>
602-
<Sha>c4bbc67763bf0c5a868862df874079380e647d61</Sha>
602+
<Sha>bac7e1caea791275b7c3ccb4cb75fd6a04a26618</Sha>
603603
</Dependency>
604-
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25065.2">
604+
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25077.4">
605605
<Uri>https://github.com/dotnet/arcade</Uri>
606-
<Sha>c4bbc67763bf0c5a868862df874079380e647d61</Sha>
606+
<Sha>bac7e1caea791275b7c3ccb4cb75fd6a04a26618</Sha>
607607
</Dependency>
608-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25065.2">
608+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25077.4">
609609
<Uri>https://github.com/dotnet/arcade</Uri>
610-
<Sha>c4bbc67763bf0c5a868862df874079380e647d61</Sha>
610+
<Sha>bac7e1caea791275b7c3ccb4cb75fd6a04a26618</Sha>
611611
</Dependency>
612-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25065.2">
612+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25077.4">
613613
<Uri>https://github.com/dotnet/arcade</Uri>
614-
<Sha>c4bbc67763bf0c5a868862df874079380e647d61</Sha>
614+
<Sha>bac7e1caea791275b7c3ccb4cb75fd6a04a26618</Sha>
615615
</Dependency>
616616
<!-- Intermediate is necessary for source build. -->
617-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25065.2">
617+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25077.4">
618618
<Uri>https://github.com/dotnet/arcade</Uri>
619-
<Sha>c4bbc67763bf0c5a868862df874079380e647d61</Sha>
619+
<Sha>bac7e1caea791275b7c3ccb4cb75fd6a04a26618</Sha>
620620
<SourceBuild RepoName="arcade" ManagedOnly="true" />
621621
</Dependency>
622622
<Dependency Name="System.Reflection.MetadataLoadContext" Version="9.0.1">

‎eng/Versions.props

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -231,9 +231,9 @@
231231
</PropertyGroup>
232232
<PropertyGroup>
233233
<!-- Dependencies from https://github.com/dotnet/razor -->
234-
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.24616.4</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
235-
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.24616.4</MicrosoftCodeAnalysisRazorToolingInternalVersion>
236-
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.24616.4</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
234+
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.25104.3</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
235+
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.25104.3</MicrosoftCodeAnalysisRazorToolingInternalVersion>
236+
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.25104.3</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
237237
</PropertyGroup>
238238
<PropertyGroup>
239239
<!-- Dependencies from https://github.com/dotnet/wpf -->
@@ -270,10 +270,10 @@
270270
</PropertyGroup>
271271
<PropertyGroup>
272272
<!-- Dependencies from https://github.com/dotnet/arcade -->
273-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25065.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
274-
<MicrosoftDotNetSignToolVersion>9.0.0-beta.25065.2</MicrosoftDotNetSignToolVersion>
275-
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.25065.2</MicrosoftDotNetXliffTasksVersion>
276-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25065.2</MicrosoftDotNetXUnitExtensionsVersion>
273+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25077.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
274+
<MicrosoftDotNetSignToolVersion>9.0.0-beta.25077.4</MicrosoftDotNetSignToolVersion>
275+
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.25077.4</MicrosoftDotNetXliffTasksVersion>
276+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25077.4</MicrosoftDotNetXUnitExtensionsVersion>
277277
</PropertyGroup>
278278
<PropertyGroup>
279279
<!-- Dependencies from https://github.com/dotnet/sourcelink -->

‎eng/common/internal/Tools.csproj

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,6 @@
1515
<PackageReference Include="Microsoft.DotNet.IBCMerge" Version="$(MicrosoftDotNetIBCMergeVersion)" Condition="'$(UsingToolIbcOptimization)' == 'true'" />
1616
<PackageReference Include="Drop.App" Version="$(DropAppVersion)" ExcludeAssets="all" Condition="'$(UsingToolVisualStudioIbcTraining)' == 'true'"/>
1717
</ItemGroup>
18-
<PropertyGroup>
19-
<RestoreSources></RestoreSources>
20-
<RestoreSources Condition="'$(UsingToolIbcOptimization)' == 'true'">
21-
https://devdiv.pkgs.visualstudio.com/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json;
22-
</RestoreSources>
23-
<RestoreSources Condition="'$(UsingToolVisualStudioIbcTraining)' == 'true'">
24-
$(RestoreSources);
25-
https://devdiv.pkgs.visualstudio.com/_packaging/VS/nuget/v3/index.json;
26-
</RestoreSources>
27-
</PropertyGroup>
2818

2919
<!-- Repository extensibility point -->
3020
<Import Project="$(RepositoryEngineeringDir)InternalTools.props" Condition="Exists('$(RepositoryEngineeringDir)InternalTools.props')" />

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"cmake": "latest"
1818
},
1919
"msbuild-sdks": {
20-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25065.2",
21-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25065.2",
20+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25077.4",
21+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25077.4",
2222
"Microsoft.Build.NoTargets": "3.7.0",
2323
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
2424
}

0 commit comments

Comments
 (0)