Skip to content

Commit 12faf66

Browse files
author
Jason Zhai
committed
Merge branch 'release/8.0.3xx' of https://github.com/dotnet/sdk into darc-release/8.0.3xx-dbcf92f9-267f-4cb5-b12f-d9fe50a3cb87
2 parents 209e564 + 2f41088 commit 12faf66

File tree

3 files changed

+30
-34
lines changed

3 files changed

+30
-34
lines changed

‎NuGet.config

Lines changed: 15 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" />
@@ -38,6 +29,20 @@
3829
<!-- End: Package sources from dotnet-runtime -->
3930
<!-- Begin: Package sources from dotnet-templating -->
4031
<add key="darc-pub-dotnet-templating-d7198dd" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-d7198dd0/nuget/v3/index.json" />
32+
<add key="darc-pub-dotnet-templating-ee4a55e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee/nuget/v3/index.json" />
33+
<add key="darc-pub-dotnet-templating-ee4a55e-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-3/nuget/v3/index.json" />
34+
<add key="darc-pub-dotnet-templating-ee4a55e-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-2/nuget/v3/index.json" />
35+
<add key="darc-pub-dotnet-templating-ee4a55e-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-1/nuget/v3/index.json" />
36+
<add key="darc-pub-dotnet-templating-6ede63a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-6ede63a6/nuget/v3/index.json" />
37+
<add key="darc-pub-dotnet-templating-ee4a55e-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-8/nuget/v3/index.json" />
38+
<add key="darc-pub-dotnet-templating-ee4a55e-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-7/nuget/v3/index.json" />
39+
<add key="darc-pub-dotnet-templating-ee4a55e-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-6/nuget/v3/index.json" />
40+
<add key="darc-pub-dotnet-templating-ee4a55e-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-5/nuget/v3/index.json" />
41+
<add key="darc-pub-dotnet-templating-ee4a55e-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-4/nuget/v3/index.json" />
42+
<add key="darc-pub-dotnet-templating-ee4a55e-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-3/nuget/v3/index.json" />
43+
<add key="darc-pub-dotnet-templating-ee4a55e-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-2/nuget/v3/index.json" />
44+
<add key="darc-pub-dotnet-templating-ee4a55e-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-1/nuget/v3/index.json" />
45+
<add key="darc-pub-dotnet-templating-6ede63a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-6ede63a6/nuget/v3/index.json" />
4146
<!-- End: Package sources from dotnet-templating -->
4247
<!-- Begin: Package sources from dotnet-windowsdesktop -->
4348
<add key="darc-int-dotnet-windowsdesktop-0dad47b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4/nuget/v3/index.json" />
@@ -77,15 +82,6 @@
7782
<!-- Begin: Package sources from dotnet-emsdk -->
7883
<!-- End: Package sources from dotnet-emsdk -->
7984
<!-- Begin: Package sources from dotnet-format -->
80-
<add key="darc-int-dotnet-format-86f5186-1" value="true" />
81-
<add key="darc-int-dotnet-format-86f5186-10" value="true" />
82-
<add key="darc-int-dotnet-format-86f5186-2" value="true" />
83-
<add key="darc-int-dotnet-format-86f5186-3" value="true" />
84-
<add key="darc-int-dotnet-format-86f5186-4" value="true" />
85-
<add key="darc-int-dotnet-format-86f5186-5" value="true" />
86-
<add key="darc-int-dotnet-format-86f5186-6" value="true" />
87-
<add key="darc-int-dotnet-format-86f5186-9" value="true" />
88-
<add key="darc-int-dotnet-format-86f5186" value="true" />
8985
<!-- End: Package sources from dotnet-format -->
9086
<!-- End: Package sources from dotnet-aspnetcore -->
9187
<!-- Begin: Package sources from dotnet-runtime -->

‎eng/Version.Details.xml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@
7777
<Sha>80c165644db640d0f309affe0daa281c7e17b939</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.10.0-3.25064.8">
@@ -293,18 +293,18 @@
293293
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
294294
<Sha>31d685b2d9a86ca1243014d175a3da813f78e428</Sha>
295295
</Dependency>
296-
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="7.0.0-preview.24629.2">
296+
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="7.0.0-preview.25104.5">
297297
<Uri>https://github.com/dotnet/razor</Uri>
298-
<Sha>47a3872a73899ff683dc9593e587e539a1264233</Sha>
298+
<Sha>291218a1671cc18216b6fc93204619d761515011</Sha>
299299
<SourceBuild RepoName="razor" ManagedOnly="true" />
300300
</Dependency>
301-
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="7.0.0-preview.24629.2">
301+
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="7.0.0-preview.25104.5">
302302
<Uri>https://github.com/dotnet/razor</Uri>
303-
<Sha>47a3872a73899ff683dc9593e587e539a1264233</Sha>
303+
<Sha>291218a1671cc18216b6fc93204619d761515011</Sha>
304304
</Dependency>
305-
<Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="7.0.0-preview.24629.2">
305+
<Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="7.0.0-preview.25104.5">
306306
<Uri>https://github.com/dotnet/razor</Uri>
307-
<Sha>47a3872a73899ff683dc9593e587e539a1264233</Sha>
307+
<Sha>291218a1671cc18216b6fc93204619d761515011</Sha>
308308
</Dependency>
309309
<Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.12">
310310
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
@@ -349,9 +349,9 @@
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>
357357
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25081.5">

‎eng/Versions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -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 -->
@@ -179,9 +179,9 @@
179179
</PropertyGroup>
180180
<!-- Dependencies from https://github.com/dotnet/razor -->
181181
<PropertyGroup>
182-
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>7.0.0-preview.24629.2</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
183-
<MicrosoftCodeAnalysisRazorToolingInternalVersion>7.0.0-preview.24629.2</MicrosoftCodeAnalysisRazorToolingInternalVersion>
184-
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>7.0.0-preview.24629.2</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
182+
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>7.0.0-preview.25104.5</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
183+
<MicrosoftCodeAnalysisRazorToolingInternalVersion>7.0.0-preview.25104.5</MicrosoftCodeAnalysisRazorToolingInternalVersion>
184+
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>7.0.0-preview.25104.5</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
185185
</PropertyGroup>
186186
<PropertyGroup>
187187
<!-- Dependencies from https://github.com/dotnet/wpf -->

0 commit comments

Comments
 (0)