Skip to content

Commit caf7c70

Browse files
author
Mirroring
committed
Merge commit 'c2559bcef7bfdb3365705c1a78eca8bc857e62a9'
2 parents 32f0000 + c2559bc commit caf7c70

File tree

4 files changed

+22
-32
lines changed

4 files changed

+22
-32
lines changed

‎NuGet.config

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,6 @@
2020
<add key="darc-int-dotnet-runtime-c8acea2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-c8acea22/nuget/v3/index.json" />
2121
<!-- End: Package sources from dotnet-runtime -->
2222
<!-- Begin: Package sources from dotnet-templating -->
23-
<add key="darc-pub-dotnet-templating-b1003b4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-b1003b44/nuget/v3/index.json" />
24-
<add key="darc-pub-dotnet-templating-b1003b4-9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-b1003b44-9/nuget/v3/index.json" />
25-
<add key="darc-pub-dotnet-templating-b1003b4-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-b1003b44-7/nuget/v3/index.json" />
26-
<add key="darc-pub-dotnet-templating-b1003b4-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-b1003b44-6/nuget/v3/index.json" />
27-
<add key="darc-pub-dotnet-templating-b1003b4-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-b1003b44-5/nuget/v3/index.json" />
28-
<add key="darc-pub-dotnet-templating-b1003b4-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-b1003b44-4/nuget/v3/index.json" />
29-
<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" />
30-
<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" />
31-
<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" />
32-
<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" />
3323
<add key="darc-pub-dotnet-templating-5f2c1e5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-5f2c1e54/nuget/v3/index.json" />
3424
<!-- End: Package sources from dotnet-templating -->
3525
<!-- Begin: Package sources from dotnet-windowsdesktop -->

‎eng/Version.Details.xml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -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.24619.1">
454+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.25060.3">
455455
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
456-
<Sha>e2b1d16fd66540b3a5813ec0ac1fd166688c3e0a</Sha>
456+
<Sha>f5fa796273e4e59926e3fab26e1ab9e7d577f5e5</Sha>
457457
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
458458
</Dependency>
459459
<Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="2.0.0-preview.1.24406.1">
@@ -589,34 +589,34 @@
589589
</Dependency>
590590
</ProductDependencies>
591591
<ToolsetDependencies>
592-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24623.3">
592+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25058.5">
593593
<Uri>https://github.com/dotnet/arcade</Uri>
594-
<Sha>e0e05154656254a735ebf19ffa5a37a8b915039b</Sha>
594+
<Sha>8cc6ecd76c24ef6665579a5c5e386a211a1e7c54</Sha>
595595
</Dependency>
596-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24623.3">
596+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25058.5">
597597
<Uri>https://github.com/dotnet/arcade</Uri>
598-
<Sha>e0e05154656254a735ebf19ffa5a37a8b915039b</Sha>
598+
<Sha>8cc6ecd76c24ef6665579a5c5e386a211a1e7c54</Sha>
599599
</Dependency>
600-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24623.3">
600+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25058.5">
601601
<Uri>https://github.com/dotnet/arcade</Uri>
602-
<Sha>e0e05154656254a735ebf19ffa5a37a8b915039b</Sha>
602+
<Sha>8cc6ecd76c24ef6665579a5c5e386a211a1e7c54</Sha>
603603
</Dependency>
604-
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.24623.3">
604+
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25058.5">
605605
<Uri>https://github.com/dotnet/arcade</Uri>
606-
<Sha>e0e05154656254a735ebf19ffa5a37a8b915039b</Sha>
606+
<Sha>8cc6ecd76c24ef6665579a5c5e386a211a1e7c54</Sha>
607607
</Dependency>
608-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24623.3">
608+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25058.5">
609609
<Uri>https://github.com/dotnet/arcade</Uri>
610-
<Sha>e0e05154656254a735ebf19ffa5a37a8b915039b</Sha>
610+
<Sha>8cc6ecd76c24ef6665579a5c5e386a211a1e7c54</Sha>
611611
</Dependency>
612-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24623.3">
612+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25058.5">
613613
<Uri>https://github.com/dotnet/arcade</Uri>
614-
<Sha>e0e05154656254a735ebf19ffa5a37a8b915039b</Sha>
614+
<Sha>8cc6ecd76c24ef6665579a5c5e386a211a1e7c54</Sha>
615615
</Dependency>
616616
<!-- Intermediate is necessary for source build. -->
617-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24623.3">
617+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25058.5">
618618
<Uri>https://github.com/dotnet/arcade</Uri>
619-
<Sha>e0e05154656254a735ebf19ffa5a37a8b915039b</Sha>
619+
<Sha>8cc6ecd76c24ef6665579a5c5e386a211a1e7c54</Sha>
620620
<SourceBuild RepoName="arcade" ManagedOnly="true" />
621621
</Dependency>
622622
<Dependency Name="System.Reflection.MetadataLoadContext" Version="9.0.1">

‎eng/Versions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -270,10 +270,10 @@
270270
</PropertyGroup>
271271
<PropertyGroup>
272272
<!-- Dependencies from https://github.com/dotnet/arcade -->
273-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24623.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
274-
<MicrosoftDotNetSignToolVersion>9.0.0-beta.24623.3</MicrosoftDotNetSignToolVersion>
275-
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.24623.3</MicrosoftDotNetXliffTasksVersion>
276-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24623.3</MicrosoftDotNetXUnitExtensionsVersion>
273+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25058.5</MicrosoftDotNetBuildTasksInstallersPackageVersion>
274+
<MicrosoftDotNetSignToolVersion>9.0.0-beta.25058.5</MicrosoftDotNetSignToolVersion>
275+
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.25058.5</MicrosoftDotNetXliffTasksVersion>
276+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25058.5</MicrosoftDotNetXUnitExtensionsVersion>
277277
</PropertyGroup>
278278
<PropertyGroup>
279279
<!-- Dependencies from https://github.com/dotnet/sourcelink -->

‎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.24623.3",
21-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24623.3",
20+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25058.5",
21+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25058.5",
2222
"Microsoft.Build.NoTargets": "3.7.0",
2323
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
2424
}

0 commit comments

Comments
 (0)