Skip to content

Commit 6c313fb

Browse files
author
Jason Zhai
committed
Merge branch 'release/9.0.1xx' of https://github.com/dotnet/sdk into darc-release/9.0.1xx-c5bbaece-335c-4130-9e58-c491a9f0fd8e
2 parents 94c2b79 + fac56b2 commit 6c313fb

File tree

5 files changed

+33
-37
lines changed

5 files changed

+33
-37
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: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -87,14 +87,14 @@
8787
<Sha>f7ab67b00991bd693a518451426ba33915614d19</Sha>
8888
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
8989
</Dependency>
90-
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.9.101-beta.24602.3">
90+
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.9.101-beta.25070.7">
9191
<Uri>https://github.com/dotnet/fsharp</Uri>
92-
<Sha>fd29258f2eb7502b09a450a8250495adb6c5caee</Sha>
92+
<Sha>47d4e3f91e4e5414b6dafbf14288b9c5a798ef99</Sha>
9393
</Dependency>
9494
<!-- Intermediate is necessary for source build. -->
95-
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="9.0.101-beta.24602.3">
95+
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="9.0.101-beta.25070.7">
9696
<Uri>https://github.com/dotnet/fsharp</Uri>
97-
<Sha>fd29258f2eb7502b09a450a8250495adb6c5caee</Sha>
97+
<Sha>47d4e3f91e4e5414b6dafbf14288b9c5a798ef99</Sha>
9898
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
9999
</Dependency>
100100
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.12.0-3.25105.5">
@@ -451,9 +451,9 @@
451451
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
452452
</Dependency>
453453
<!-- Intermediate is necessary for source build. -->
454-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.25060.3">
454+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.25081.6">
455455
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
456-
<Sha>f5fa796273e4e59926e3fab26e1ab9e7d577f5e5</Sha>
456+
<Sha>1cec3b4a8fb07138136a1ca1e04763bfcf7841db</Sha>
457457
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
458458
</Dependency>
459459
<Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="2.0.0-rtm.1.25059.4">
@@ -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: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@
200200
</PropertyGroup>
201201
<PropertyGroup>
202202
<!-- Dependencies from https://github.com/Microsoft/visualfsharp -->
203-
<MicrosoftFSharpCompilerPackageVersion>12.9.101-beta.24602.3</MicrosoftFSharpCompilerPackageVersion>
203+
<MicrosoftFSharpCompilerPackageVersion>12.9.101-beta.25070.7</MicrosoftFSharpCompilerPackageVersion>
204204
</PropertyGroup>
205205
<PropertyGroup>
206206
<!-- Dependencies from https://github.com/dotnet/roslyn -->
@@ -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)