Skip to content

Commit d685d57

Browse files
author
Mirroring
committed
Merge commit 'd20e12511ba49f306de6fec625cf6826c8102642'
2 parents 65ffcec + d20e125 commit d685d57

File tree

4 files changed

+50
-19
lines changed

4 files changed

+50
-19
lines changed

‎NuGet.config

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-emsdk -->
77
<add key="darc-pub-dotnet-emsdk-adc0d6e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-adc0d6e7/nuget/v3/index.json" />
8+
<add key="darc-pub-dotnet-emsdk-adc0d6e-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-adc0d6e7-7/nuget/v3/index.json" />
9+
<add key="darc-pub-dotnet-emsdk-adc0d6e-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-adc0d6e7-6/nuget/v3/index.json" />
10+
<add key="darc-pub-dotnet-emsdk-adc0d6e-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-adc0d6e7-5/nuget/v3/index.json" />
11+
<add key="darc-pub-dotnet-emsdk-adc0d6e-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-adc0d6e7-4/nuget/v3/index.json" />
12+
<add key="darc-pub-dotnet-emsdk-adc0d6e-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-adc0d6e7-3/nuget/v3/index.json" />
13+
<add key="darc-pub-dotnet-emsdk-adc0d6e-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-adc0d6e7-2/nuget/v3/index.json" />
14+
<add key="darc-pub-dotnet-emsdk-adc0d6e-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-adc0d6e7-1/nuget/v3/index.json" />
815
<!-- End: Package sources from dotnet-emsdk -->
916
<!-- Begin: Package sources from dotnet-format -->
1017
<add key="darc-pub-dotnet-format-c61d046" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-c61d046a/nuget/v3/index.json" />
@@ -16,6 +23,10 @@
1623
<!-- End: Package sources from dotnet-format -->
1724
<!-- Begin: Package sources from dotnet-aspnetcore -->
1825
<add key="darc-int-dotnet-aspnetcore-4ae1269" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-4ae1269b/nuget/v3/index.json" />
26+
<add key="darc-int-dotnet-aspnetcore-4ae1269-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-4ae1269b-7/nuget/v3/index.json" />
27+
<add key="darc-int-dotnet-aspnetcore-4ae1269-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-4ae1269b-6/nuget/v3/index.json" />
28+
<add key="darc-int-dotnet-aspnetcore-4ae1269-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-4ae1269b-5/nuget/v3/index.json" />
29+
<add key="darc-int-dotnet-aspnetcore-4ae1269-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-4ae1269b-4/nuget/v3/index.json" />
1930
<!-- End: Package sources from dotnet-aspnetcore -->
2031
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
2132
<add key="darc-pub-DotNet-msbuild-Trusted-323d4b3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-323d4b37/nuget/v3/index.json" />
@@ -24,12 +35,20 @@
2435
<!-- End: Package sources from dotnet-roslyn-analyzers -->
2536
<!-- Begin: Package sources from dotnet-runtime -->
2637
<add key="darc-int-dotnet-runtime-efd5742" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-efd5742b/nuget/v3/index.json" />
38+
<add key="darc-int-dotnet-runtime-efd5742-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-efd5742b-7/nuget/v3/index.json" />
39+
<add key="darc-int-dotnet-runtime-efd5742-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-efd5742b-6/nuget/v3/index.json" />
40+
<add key="darc-int-dotnet-runtime-efd5742-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-efd5742b-5/nuget/v3/index.json" />
41+
<add key="darc-int-dotnet-runtime-efd5742-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-efd5742b-4/nuget/v3/index.json" />
2742
<!-- End: Package sources from dotnet-runtime -->
2843
<!-- Begin: Package sources from dotnet-templating -->
29-
<add key="darc-pub-dotnet-templating-3ed23f5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-3ed23f5b/nuget/v3/index.json" />
44+
<add key="darc-pub-dotnet-templating-d8a5bd5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-d8a5bd5b/nuget/v3/index.json" />
3045
<!-- End: Package sources from dotnet-templating -->
3146
<!-- Begin: Package sources from dotnet-windowsdesktop -->
3247
<add key="darc-int-dotnet-windowsdesktop-cda1f82" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-cda1f825/nuget/v3/index.json" />
48+
<add key="darc-int-dotnet-windowsdesktop-cda1f82-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-cda1f825-7/nuget/v3/index.json" />
49+
<add key="darc-int-dotnet-windowsdesktop-cda1f82-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-cda1f825-6/nuget/v3/index.json" />
50+
<add key="darc-int-dotnet-windowsdesktop-cda1f82-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-cda1f825-5/nuget/v3/index.json" />
51+
<add key="darc-int-dotnet-windowsdesktop-cda1f82-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-cda1f825-4/nuget/v3/index.json" />
3352
<!-- End: Package sources from dotnet-windowsdesktop -->
3453
<!-- Begin: Package sources from dotnet-winforms -->
3554
<!-- End: Package sources from dotnet-winforms -->
@@ -56,16 +75,28 @@
5675
<!-- Begin: Package sources from dotnet-templating -->
5776
<!-- End: Package sources from dotnet-templating -->
5877
<!-- Begin: Package sources from dotnet-aspnetcore -->
78+
<add key="darc-int-dotnet-aspnetcore-4ae1269-4" value="true" />
79+
<add key="darc-int-dotnet-aspnetcore-4ae1269-5" value="true" />
80+
<add key="darc-int-dotnet-aspnetcore-4ae1269-6" value="true" />
81+
<add key="darc-int-dotnet-aspnetcore-4ae1269-7" value="true" />
5982
<add key="darc-int-dotnet-aspnetcore-4ae1269" value="true" />
6083
<!-- Begin: Package sources from dotnet-emsdk -->
6184
<!-- End: Package sources from dotnet-emsdk -->
6285
<!-- Begin: Package sources from dotnet-format -->
6386
<!-- End: Package sources from dotnet-format -->
6487
<!-- End: Package sources from dotnet-aspnetcore -->
6588
<!-- Begin: Package sources from dotnet-runtime -->
89+
<add key="darc-int-dotnet-runtime-efd5742-4" value="true" />
90+
<add key="darc-int-dotnet-runtime-efd5742-5" value="true" />
91+
<add key="darc-int-dotnet-runtime-efd5742-6" value="true" />
92+
<add key="darc-int-dotnet-runtime-efd5742-7" value="true" />
6693
<add key="darc-int-dotnet-runtime-efd5742" value="true" />
6794
<!-- End: Package sources from dotnet-runtime -->
6895
<!-- Begin: Package sources from dotnet-windowsdesktop -->
96+
<add key="darc-int-dotnet-windowsdesktop-cda1f82-4" value="true" />
97+
<add key="darc-int-dotnet-windowsdesktop-cda1f82-5" value="true" />
98+
<add key="darc-int-dotnet-windowsdesktop-cda1f82-6" value="true" />
99+
<add key="darc-int-dotnet-windowsdesktop-cda1f82-7" value="true" />
69100
<add key="darc-int-dotnet-windowsdesktop-cda1f82" value="true" />
70101
<!-- Begin: Package sources from dotnet-winforms -->
71102
<!-- End: Package sources from dotnet-winforms -->

‎eng/Version.Details.xml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
<ProductDependencies>
44
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.313">
55
<Uri>https://github.com/dotnet/templating</Uri>
6-
<Sha>3ed23f5b6d7779b24ea2d3199f4e3c3431cf863b</Sha>
6+
<Sha>d8a5bd5be4cdd1e018220cd8d836bec7d10d6ada</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.313-servicing.25258.1">
8+
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.313-servicing.25264.1">
99
<Uri>https://github.com/dotnet/templating</Uri>
10-
<Sha>3ed23f5b6d7779b24ea2d3199f4e3c3431cf863b</Sha>
10+
<Sha>d8a5bd5be4cdd1e018220cd8d836bec7d10d6ada</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.313-servicing.25258.1">
12+
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.313-servicing.25264.1">
1313
<Uri>https://github.com/dotnet/templating</Uri>
14-
<Sha>3ed23f5b6d7779b24ea2d3199f4e3c3431cf863b</Sha>
14+
<Sha>d8a5bd5be4cdd1e018220cd8d836bec7d10d6ada</Sha>
1515
<SourceBuild RepoName="templating" ManagedOnly="true" />
1616
</Dependency>
1717
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.16">
@@ -491,22 +491,22 @@
491491
</Dependency>
492492
</ProductDependencies>
493493
<ToolsetDependencies>
494-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25263.4">
494+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25264.2">
495495
<Uri>https://github.com/dotnet/arcade</Uri>
496-
<Sha>20ab70a74d52b68f4271bd946884e24049b14f83</Sha>
496+
<Sha>983d15077d88cfed26837e40e8f984fdee5d1715</Sha>
497497
<SourceBuild RepoName="arcade" ManagedOnly="true" />
498498
</Dependency>
499-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25263.4">
499+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25264.2">
500500
<Uri>https://github.com/dotnet/arcade</Uri>
501-
<Sha>20ab70a74d52b68f4271bd946884e24049b14f83</Sha>
501+
<Sha>983d15077d88cfed26837e40e8f984fdee5d1715</Sha>
502502
</Dependency>
503-
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25263.4">
503+
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25264.2">
504504
<Uri>https://github.com/dotnet/arcade</Uri>
505-
<Sha>20ab70a74d52b68f4271bd946884e24049b14f83</Sha>
505+
<Sha>983d15077d88cfed26837e40e8f984fdee5d1715</Sha>
506506
</Dependency>
507-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25263.4">
507+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25264.2">
508508
<Uri>https://github.com/dotnet/arcade</Uri>
509-
<Sha>20ab70a74d52b68f4271bd946884e24049b14f83</Sha>
509+
<Sha>983d15077d88cfed26837e40e8f984fdee5d1715</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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<SystemCollectionsImmutablePackageVersion>7.0.0</SystemCollectionsImmutablePackageVersion>
3737
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
3838
<SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
39-
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25263.4</MicrosoftDotNetSignToolVersion>
39+
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25264.2</MicrosoftDotNetSignToolVersion>
4040
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
4141
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
4242
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -147,7 +147,7 @@
147147
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
148148
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
149149
<!-- test dependencies -->
150-
<MicrosoftTemplateEngineMocksPackageVersion>8.0.313-servicing.25258.1</MicrosoftTemplateEngineMocksPackageVersion>
150+
<MicrosoftTemplateEngineMocksPackageVersion>8.0.313-servicing.25264.1</MicrosoftTemplateEngineMocksPackageVersion>
151151
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
152152
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
153153
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>
@@ -213,7 +213,7 @@
213213
<PropertyGroup>
214214
<FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
215215
<FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
216-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25263.4</MicrosoftDotNetXUnitExtensionsVersion>
216+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25264.2</MicrosoftDotNetXUnitExtensionsVersion>
217217
<MoqPackageVersion>4.18.4</MoqPackageVersion>
218218
<XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
219219
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
}
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25263.4",
18-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25263.4"
17+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25264.2",
18+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25264.2"
1919
}
2020
}

0 commit comments

Comments
 (0)