Skip to content

Commit 295b84e

Browse files
author
Mirroring
committed
Merge commit '2e2b95f3fb0ef6ae78b16fca136bb699e7116d07'
2 parents 32c07e9 + 2e2b95f commit 295b84e

File tree

4 files changed

+22
-22
lines changed

4 files changed

+22
-22
lines changed

‎NuGet.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<add key="darc-int-dotnet-runtime-f41eed7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-f41eed7a/nuget/v3/index.json" />
2626
<!-- End: Package sources from dotnet-runtime -->
2727
<!-- Begin: Package sources from dotnet-templating -->
28-
<add key="darc-pub-dotnet-templating-a2c4545" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-a2c45457/nuget/v3/index.json" />
28+
<add key="darc-pub-dotnet-templating-d5ddb7f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-d5ddb7f6/nuget/v3/index.json" />
2929
<!-- End: Package sources from dotnet-templating -->
3030
<!-- Begin: Package sources from dotnet-windowsdesktop -->
3131
<add key="darc-int-dotnet-windowsdesktop-7852742" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-7852742e/nuget/v3/index.json" />

‎eng/Version.Details.xml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.415">
4+
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.416">
55
<Uri>https://github.com/dotnet/templating</Uri>
6-
<Sha>fe0130d773314a195b81fb2eecfb14db9b847563</Sha>
6+
<Sha>d5ddb7f6ee6f52c8e8ff512eca1cce7730b38c51</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.415-servicing.25465.9">
8+
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.416-servicing.25515.10">
99
<Uri>https://github.com/dotnet/templating</Uri>
10-
<Sha>fe0130d773314a195b81fb2eecfb14db9b847563</Sha>
10+
<Sha>d5ddb7f6ee6f52c8e8ff512eca1cce7730b38c51</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.415-servicing.25465.9">
12+
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.416-servicing.25515.10">
1313
<Uri>https://github.com/dotnet/templating</Uri>
14-
<Sha>fe0130d773314a195b81fb2eecfb14db9b847563</Sha>
14+
<Sha>d5ddb7f6ee6f52c8e8ff512eca1cce7730b38c51</Sha>
1515
<SourceBuild RepoName="templating" ManagedOnly="true" />
1616
</Dependency>
1717
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.22">
@@ -491,22 +491,22 @@
491491
</Dependency>
492492
</ProductDependencies>
493493
<ToolsetDependencies>
494-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25504.1">
494+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25515.1">
495495
<Uri>https://github.com/dotnet/arcade</Uri>
496-
<Sha>3edea53c9b10e4bc63de863d71a05d47d9bb5b69</Sha>
496+
<Sha>6544413e02741855b701468aa8afc6cf8ca62c72</Sha>
497497
<SourceBuild RepoName="arcade" ManagedOnly="true" />
498498
</Dependency>
499-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25504.1">
499+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25515.1">
500500
<Uri>https://github.com/dotnet/arcade</Uri>
501-
<Sha>3edea53c9b10e4bc63de863d71a05d47d9bb5b69</Sha>
501+
<Sha>6544413e02741855b701468aa8afc6cf8ca62c72</Sha>
502502
</Dependency>
503-
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25504.1">
503+
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25515.1">
504504
<Uri>https://github.com/dotnet/arcade</Uri>
505-
<Sha>3edea53c9b10e4bc63de863d71a05d47d9bb5b69</Sha>
505+
<Sha>6544413e02741855b701468aa8afc6cf8ca62c72</Sha>
506506
</Dependency>
507-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25504.1">
507+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25515.1">
508508
<Uri>https://github.com/dotnet/arcade</Uri>
509-
<Sha>3edea53c9b10e4bc63de863d71a05d47d9bb5b69</Sha>
509+
<Sha>6544413e02741855b701468aa8afc6cf8ca62c72</Sha>
510510
</Dependency>
511511
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.1">
512512
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>

‎eng/Versions.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<SystemCollectionsImmutablePackageVersion>8.0.0</SystemCollectionsImmutablePackageVersion>
3737
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
3838
<SystemReflectionMetadataVersion>8.0.0</SystemReflectionMetadataVersion>
39-
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25504.1</MicrosoftDotNetSignToolVersion>
39+
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25515.1</MicrosoftDotNetSignToolVersion>
4040
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
4141
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
4242
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -143,13 +143,13 @@
143143
</PropertyGroup>
144144
<PropertyGroup>
145145
<!-- Dependencies from https://github.com/dotnet/templating -->
146-
<MicrosoftTemplateEngineAbstractionsPackageVersion>8.0.415</MicrosoftTemplateEngineAbstractionsPackageVersion>
146+
<MicrosoftTemplateEngineAbstractionsPackageVersion>8.0.416</MicrosoftTemplateEngineAbstractionsPackageVersion>
147147
<MicrosoftTemplateEngineEdgePackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineEdgePackageVersion>
148148
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
149149
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
150150
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
151151
<!-- test dependencies -->
152-
<MicrosoftTemplateEngineMocksPackageVersion>8.0.415-servicing.25465.9</MicrosoftTemplateEngineMocksPackageVersion>
152+
<MicrosoftTemplateEngineMocksPackageVersion>8.0.416-servicing.25515.10</MicrosoftTemplateEngineMocksPackageVersion>
153153
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
154154
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
155155
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>
@@ -215,7 +215,7 @@
215215
<PropertyGroup>
216216
<FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
217217
<FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
218-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25504.1</MicrosoftDotNetXUnitExtensionsVersion>
218+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25515.1</MicrosoftDotNetXUnitExtensionsVersion>
219219
<MoqPackageVersion>4.18.4</MoqPackageVersion>
220220
<XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
221221
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>

‎global.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "8.0.120",
3+
"dotnet": "8.0.121",
44
"runtimes": {
55
"dotnet": [
66
"$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)"
@@ -14,7 +14,7 @@
1414
}
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25504.1",
18-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25504.1"
17+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25515.1",
18+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25515.1"
1919
}
2020
}

0 commit comments

Comments
 (0)