Skip to content

Commit 16b98ae

Browse files
surayya-MSsurayya-MS
authored
Merge branch 'release/8.0.4xx' into multi-arch-tarballs
2 parents 960bb7d + e2f6140 commit 16b98ae

File tree

4 files changed

+34
-39
lines changed

4 files changed

+34
-39
lines changed

‎NuGet.config

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,7 @@
1010
<add key="darc-pub-dotnet-emsdk-c458a76-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c458a764-1/nuget/v3/index.json" />
1111
<!-- End: Package sources from dotnet-emsdk -->
1212
<!-- Begin: Package sources from dotnet-format -->
13-
<add key="darc-pub-dotnet-format-86f5186" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-86f5186d/nuget/v3/index.json" />
14-
<add key="darc-int-dotnet-format-86f5186" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-86f5186d/nuget/v3/index.json" />
15-
<add key="darc-int-dotnet-format-86f5186-9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-86f5186d-9/nuget/v3/index.json" />
16-
<add key="darc-int-dotnet-format-86f5186-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-86f5186d-6/nuget/v3/index.json" />
17-
<add key="darc-int-dotnet-format-86f5186-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-86f5186d-5/nuget/v3/index.json" />
18-
<add key="darc-int-dotnet-format-86f5186-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-86f5186d-4/nuget/v3/index.json" />
19-
<add key="darc-int-dotnet-format-86f5186-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-86f5186d-3/nuget/v3/index.json" />
20-
<add key="darc-int-dotnet-format-86f5186-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-86f5186d-2/nuget/v3/index.json" />
21-
<add key="darc-int-dotnet-format-86f5186-10" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-86f5186d-10/nuget/v3/index.json" />
22-
<add key="darc-int-dotnet-format-86f5186-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-86f5186d-1/nuget/v3/index.json" />
13+
<add key="darc-pub-dotnet-format-42ef1d0" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-42ef1d04/nuget/v3/index.json" />
2314
<!-- End: Package sources from dotnet-format -->
2415
<!-- Begin: Package sources from dotnet-aspnetcore -->
2516
<add key="darc-int-dotnet-aspnetcore-31d685b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-31d685b2/nuget/v3/index.json" />
@@ -37,6 +28,19 @@
3728
<add key="darc-int-dotnet-runtime-89ef51c-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-89ef51c5-3/nuget/v3/index.json" />
3829
<!-- End: Package sources from dotnet-runtime -->
3930
<!-- Begin: Package sources from dotnet-templating -->
31+
<add key="darc-pub-dotnet-templating-93a5894" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944/nuget/v3/index.json" />
32+
<add key="darc-pub-dotnet-templating-93a5894-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-3/nuget/v3/index.json" />
33+
<add key="darc-pub-dotnet-templating-93a5894-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-2/nuget/v3/index.json" />
34+
<add key="darc-pub-dotnet-templating-93a5894-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-1/nuget/v3/index.json" />
35+
<add key="darc-pub-dotnet-templating-40256cc" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-40256cc3/nuget/v3/index.json" />
36+
<add key="darc-pub-dotnet-templating-93a5894-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-8/nuget/v3/index.json" />
37+
<add key="darc-pub-dotnet-templating-93a5894-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-7/nuget/v3/index.json" />
38+
<add key="darc-pub-dotnet-templating-93a5894-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-6/nuget/v3/index.json" />
39+
<add key="darc-pub-dotnet-templating-93a5894-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-5/nuget/v3/index.json" />
40+
<add key="darc-pub-dotnet-templating-93a5894-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-4/nuget/v3/index.json" />
41+
<add key="darc-pub-dotnet-templating-93a5894-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-3/nuget/v3/index.json" />
42+
<add key="darc-pub-dotnet-templating-93a5894-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-2/nuget/v3/index.json" />
43+
<add key="darc-pub-dotnet-templating-93a5894-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-1/nuget/v3/index.json" />
4044
<add key="darc-pub-dotnet-templating-40256cc" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-40256cc3/nuget/v3/index.json" />
4145
<!-- End: Package sources from dotnet-templating -->
4246
<!-- Begin: Package sources from dotnet-windowsdesktop -->
@@ -75,15 +79,6 @@
7579
<add key="darc-int-dotnet-aspnetcore-31d685b-3" value="true" />
7680
<add key="darc-int-dotnet-aspnetcore-31d685b" value="true" />
7781
<!-- Begin: Package sources from dotnet-format -->
78-
<add key="darc-int-dotnet-format-86f5186-1" value="true" />
79-
<add key="darc-int-dotnet-format-86f5186-10" value="true" />
80-
<add key="darc-int-dotnet-format-86f5186-2" value="true" />
81-
<add key="darc-int-dotnet-format-86f5186-3" value="true" />
82-
<add key="darc-int-dotnet-format-86f5186-4" value="true" />
83-
<add key="darc-int-dotnet-format-86f5186-5" value="true" />
84-
<add key="darc-int-dotnet-format-86f5186-6" value="true" />
85-
<add key="darc-int-dotnet-format-86f5186-9" value="true" />
86-
<add key="darc-int-dotnet-format-86f5186" value="true" />
8782
<!-- End: Package sources from dotnet-format -->
8883
<!-- End: Package sources from dotnet-aspnetcore -->
8984
<!-- Begin: Package sources from dotnet-runtime -->

‎eng/Version.Details.xml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@
7777
<Sha>e11d7079bebc6f101c5313fe0d1de9e3d38a7c02</Sha>
7878
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
7979
</Dependency>
80-
<Dependency Name="dotnet-format" Version="8.3.546805">
81-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-format</Uri>
82-
<Sha>86f5186deeea364bd8541d51657e52a54b2a96b2</Sha>
80+
<Dependency Name="dotnet-format" Version="8.3.607401">
81+
<Uri>https://github.com/dotnet/format</Uri>
82+
<Sha>42ef1d04e544c2a0dca064f9fc982639ca516a84</Sha>
8383
<SourceBuild RepoName="format" ManagedOnly="true" />
8484
</Dependency>
8585
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.11.0-3.24554.2">
@@ -349,14 +349,14 @@
349349
<Sha>02fe27cd6a9b001c8feb7938e6ef4b3799745759</Sha>
350350
<SourceBuild RepoName="command-line-api" ManagedOnly="true" />
351351
</Dependency>
352-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.25060.2">
352+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.25104.1">
353353
<Uri>https://github.com/dotnet/source-build-externals</Uri>
354-
<Sha>c7cb4da26e74ef645e3e98fcb4534a7d66247a82</Sha>
354+
<Sha>dc30cd1ec22f198d658e011c14525d4d65873991</Sha>
355355
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
356356
</Dependency>
357-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25060.2">
357+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25081.5">
358358
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
359-
<Sha>f9542c50beaefc38dd9d7ec9ea38d54fd154f21a</Sha>
359+
<Sha>d73fc552386797322e84fa9b2ef5eaa5369de83c</Sha>
360360
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
361361
</Dependency>
362362
<Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="2.0.0-rtm.1.25064.1">
@@ -491,22 +491,22 @@
491491
</Dependency>
492492
</ProductDependencies>
493493
<ToolsetDependencies>
494-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25066.6">
494+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25105.2">
495495
<Uri>https://github.com/dotnet/arcade</Uri>
496-
<Sha>4db725213dccb0d1102427bce1c39ba3117da7f7</Sha>
496+
<Sha>f9e274e2269d2cda748e78344afe681411748157</Sha>
497497
<SourceBuild RepoName="arcade" ManagedOnly="true" />
498498
</Dependency>
499-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25066.6">
499+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25105.2">
500500
<Uri>https://github.com/dotnet/arcade</Uri>
501-
<Sha>4db725213dccb0d1102427bce1c39ba3117da7f7</Sha>
501+
<Sha>f9e274e2269d2cda748e78344afe681411748157</Sha>
502502
</Dependency>
503-
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25066.6">
503+
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25105.2">
504504
<Uri>https://github.com/dotnet/arcade</Uri>
505-
<Sha>4db725213dccb0d1102427bce1c39ba3117da7f7</Sha>
505+
<Sha>f9e274e2269d2cda748e78344afe681411748157</Sha>
506506
</Dependency>
507-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25066.6">
507+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25105.2">
508508
<Uri>https://github.com/dotnet/arcade</Uri>
509-
<Sha>4db725213dccb0d1102427bce1c39ba3117da7f7</Sha>
509+
<Sha>f9e274e2269d2cda748e78344afe681411748157</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>8.0.0</SystemCollectionsImmutablePackageVersion>
3737
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
3838
<SystemReflectionMetadataVersion>8.0.0</SystemReflectionMetadataVersion>
39-
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25066.6</MicrosoftDotNetSignToolVersion>
39+
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25105.2</MicrosoftDotNetSignToolVersion>
4040
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
4141
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
4242
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -115,7 +115,7 @@
115115
</PropertyGroup>
116116
<PropertyGroup>
117117
<!-- Dependencies from https://github.com/dotnet/format -->
118-
<dotnetformatVersion>8.3.546805</dotnetformatVersion>
118+
<dotnetformatVersion>8.3.607401</dotnetformatVersion>
119119
</PropertyGroup>
120120
<PropertyGroup>
121121
<!-- Dependencies from https://github.com/dotnet/roslyn-analyzers -->
@@ -213,7 +213,7 @@
213213
<PropertyGroup>
214214
<FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
215215
<FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
216-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25066.6</MicrosoftDotNetXUnitExtensionsVersion>
216+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25105.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.25066.6",
18-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25066.6"
17+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25105.2",
18+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25105.2"
1919
}
2020
}

0 commit comments

Comments
 (0)