Skip to content

Commit 8631aec

Browse files
author
Jason Zhai
committed
Merge branch 'release/8.0.4xx' of https://github.com/dotnet/sdk into darc-release/8.0.4xx-f75d0fe2-6945-4c7b-ae39-5c16fc366796
2 parents b9a63ca + e2f6140 commit 8631aec

File tree

3 files changed

+21
-25
lines changed

3 files changed

+21
-25
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-5d99405" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-5d994056/nuget/v3/index.json" />
32+
<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" />
33+
<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" />
34+
<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" />
35+
<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" />
36+
<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" />
37+
<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" />
38+
<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" />
39+
<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" />
40+
<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" />
41+
<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" />
42+
<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" />
43+
<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" />
44+
<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" />
45+
<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" />
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" />
@@ -75,15 +80,6 @@
7580
<add key="darc-int-dotnet-aspnetcore-31d685b-3" value="true" />
7681
<add key="darc-int-dotnet-aspnetcore-31d685b" value="true" />
7782
<!-- 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" />
8783
<!-- End: Package sources from dotnet-format -->
8884
<!-- End: Package sources from dotnet-aspnetcore -->
8985
<!-- Begin: Package sources from dotnet-runtime -->

eng/Version.Details.xml

Lines changed: 5 additions & 5 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,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: 1 addition & 1 deletion
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 -->

0 commit comments

Comments
 (0)