Skip to content

Commit 5d2d6a3

Browse files
author
Mirroring
committed
Merge commit '41d0a200c11132eaa1eb5a0c7659baec43d52316'
2 parents 0a4862c + 41d0a20 commit 5d2d6a3

File tree

19 files changed

+139
-123
lines changed

19 files changed

+139
-123
lines changed

NuGet.config

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,15 @@
3131
<add key="darc-pub-dotnet-emsdk-0bcc3e6-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-0bcc3e67-1/nuget/v3/index.json" />
3232
<!-- End: Package sources from dotnet-emsdk -->
3333
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
34-
<add key="darc-pub-DotNet-msbuild-Trusted-5d8159c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-5d8159c5/nuget/v3/index.json" />
34+
<add key="darc-pub-DotNet-msbuild-Trusted-3e6a44d" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-3e6a44de/nuget/v3/index.json" />
3535
<!-- End: Package sources from DotNet-msbuild-Trusted -->
3636
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
3737
<!-- End: Package sources from dotnet-roslyn-analyzers -->
3838
<!-- Begin: Package sources from dotnet-runtime -->
3939
<add key="darc-int-dotnet-runtime-aae90fa" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-aae90fa0/nuget/v3/index.json" />
4040
<!-- End: Package sources from dotnet-runtime -->
4141
<!-- Begin: Package sources from dotnet-templating -->
42-
<add key="darc-pub-dotnet-templating-349a1a1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-349a1a14/nuget/v3/index.json" />
43-
<add key="darc-pub-dotnet-templating-349a1a1-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-349a1a14-1/nuget/v3/index.json" />
42+
<add key="darc-pub-dotnet-templating-8f75dca" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8f75dca0/nuget/v3/index.json" />
4443
<!-- End: Package sources from dotnet-templating -->
4544
<!-- Begin: Package sources from dotnet-windowsdesktop -->
4645
<add key="darc-int-dotnet-windowsdesktop-1d6033e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-1d6033e3/nuget/v3/index.json" />

eng/Version.Details.xml

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="9.0.304">
4+
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="9.0.305">
55
<Uri>https://github.com/dotnet/templating</Uri>
6-
<Sha>349a1a14fad0af1a3b455c694da7fdc0cec63d60</Sha>
6+
<Sha>8f75dca081e1ebd54bbc0d1ae57fc3d6b7172ec9</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="9.0.304-servicing.25364.1">
8+
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="9.0.305-servicing.25406.4">
99
<Uri>https://github.com/dotnet/templating</Uri>
10-
<Sha>349a1a14fad0af1a3b455c694da7fdc0cec63d60</Sha>
10+
<Sha>8f75dca081e1ebd54bbc0d1ae57fc3d6b7172ec9</Sha>
1111
</Dependency>
1212
<!-- Intermediate is necessary for source build. -->
1313
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="9.0.300-preview.25209.5">
@@ -69,18 +69,18 @@
6969
<Sha>0bcc3e67026ea44a16fb018a50e4e134c06ab3d6</Sha>
7070
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
7171
</Dependency>
72-
<Dependency Name="Microsoft.Build" Version="17.14.16">
72+
<Dependency Name="Microsoft.Build" Version="17.14.20">
7373
<Uri>https://github.com/dotnet/msbuild</Uri>
74-
<Sha>5d8159c5fa474b60b0c1e5159b0dd054a102ee8a</Sha>
74+
<Sha>3e6a44deac638c77abe57022eab4ae9db4cf442c</Sha>
7575
</Dependency>
76-
<Dependency Name="Microsoft.Build.Localization" Version="17.14.16-servicing-25360-01">
76+
<Dependency Name="Microsoft.Build.Localization" Version="17.14.20-servicing-25404-05">
7777
<Uri>https://github.com/dotnet/msbuild</Uri>
78-
<Sha>5d8159c5fa474b60b0c1e5159b0dd054a102ee8a</Sha>
78+
<Sha>3e6a44deac638c77abe57022eab4ae9db4cf442c</Sha>
7979
</Dependency>
8080
<!-- Intermediate is necessary for source build. -->
81-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.14.16-servicing-25360-01">
81+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.14.20-servicing-25404-05">
8282
<Uri>https://github.com/dotnet/msbuild</Uri>
83-
<Sha>5d8159c5fa474b60b0c1e5159b0dd054a102ee8a</Sha>
83+
<Sha>3e6a44deac638c77abe57022eab4ae9db4cf442c</Sha>
8484
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
8585
</Dependency>
8686
<Dependency Name="Microsoft.FSharp.Compiler" Version="13.9.303-beta.25361.1">
@@ -93,43 +93,43 @@
9393
<Sha>14987c804f33917bf15f4c25e0cd16ecd01807f4</Sha>
9494
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
9595
</Dependency>
96-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.14.0-3.25359.3">
96+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.14.0-3.25404.3">
9797
<Uri>https://github.com/dotnet/roslyn</Uri>
98-
<Sha>6dbcfd2f553ef1ef0ac48878ab17d18c1360735d</Sha>
98+
<Sha>22348b23fcd770362ca1ed60c5ec3db22c9cabc7</Sha>
9999
</Dependency>
100100
<!-- Intermediate is necessary for source build. -->
101-
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.14.0-3.25359.3">
101+
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.14.0-3.25404.3">
102102
<Uri>https://github.com/dotnet/roslyn</Uri>
103-
<Sha>6dbcfd2f553ef1ef0ac48878ab17d18c1360735d</Sha>
103+
<Sha>22348b23fcd770362ca1ed60c5ec3db22c9cabc7</Sha>
104104
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
105105
</Dependency>
106-
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.14.0-3.25359.3">
106+
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.14.0-3.25404.3">
107107
<Uri>https://github.com/dotnet/roslyn</Uri>
108-
<Sha>6dbcfd2f553ef1ef0ac48878ab17d18c1360735d</Sha>
108+
<Sha>22348b23fcd770362ca1ed60c5ec3db22c9cabc7</Sha>
109109
</Dependency>
110-
<Dependency Name="Microsoft.CodeAnalysis" Version="4.14.0-3.25359.3">
110+
<Dependency Name="Microsoft.CodeAnalysis" Version="4.14.0-3.25404.3">
111111
<Uri>https://github.com/dotnet/roslyn</Uri>
112-
<Sha>6dbcfd2f553ef1ef0ac48878ab17d18c1360735d</Sha>
112+
<Sha>22348b23fcd770362ca1ed60c5ec3db22c9cabc7</Sha>
113113
</Dependency>
114-
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.14.0-3.25359.3">
114+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.14.0-3.25404.3">
115115
<Uri>https://github.com/dotnet/roslyn</Uri>
116-
<Sha>6dbcfd2f553ef1ef0ac48878ab17d18c1360735d</Sha>
116+
<Sha>22348b23fcd770362ca1ed60c5ec3db22c9cabc7</Sha>
117117
</Dependency>
118-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.14.0-3.25359.3">
118+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.14.0-3.25404.3">
119119
<Uri>https://github.com/dotnet/roslyn</Uri>
120-
<Sha>6dbcfd2f553ef1ef0ac48878ab17d18c1360735d</Sha>
120+
<Sha>22348b23fcd770362ca1ed60c5ec3db22c9cabc7</Sha>
121121
</Dependency>
122-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.14.0-3.25359.3">
122+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.14.0-3.25404.3">
123123
<Uri>https://github.com/dotnet/roslyn</Uri>
124-
<Sha>6dbcfd2f553ef1ef0ac48878ab17d18c1360735d</Sha>
124+
<Sha>22348b23fcd770362ca1ed60c5ec3db22c9cabc7</Sha>
125125
</Dependency>
126-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.14.0-3.25359.3">
126+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.14.0-3.25404.3">
127127
<Uri>https://github.com/dotnet/roslyn</Uri>
128-
<Sha>6dbcfd2f553ef1ef0ac48878ab17d18c1360735d</Sha>
128+
<Sha>22348b23fcd770362ca1ed60c5ec3db22c9cabc7</Sha>
129129
</Dependency>
130-
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.14.0-3.25359.3">
130+
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.14.0-3.25404.3">
131131
<Uri>https://github.com/dotnet/roslyn</Uri>
132-
<Sha>6dbcfd2f553ef1ef0ac48878ab17d18c1360735d</Sha>
132+
<Sha>22348b23fcd770362ca1ed60c5ec3db22c9cabc7</Sha>
133133
</Dependency>
134134
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="9.0.8-servicing.25368.8">
135135
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
@@ -321,20 +321,20 @@
321321
<Sha>215a587e52efa710de84138b0a3374b860b924d8</Sha>
322322
<SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
323323
</Dependency>
324-
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="9.0.0-preview.25329.3">
324+
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="9.0.0-preview.25377.2">
325325
<Uri>https://github.com/dotnet/razor</Uri>
326326
<Sha>3372435431977e91904a23ceb1eab689badc1bd9</Sha>
327327
</Dependency>
328-
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="9.0.0-preview.25329.3">
328+
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="9.0.0-preview.25377.2">
329329
<Uri>https://github.com/dotnet/razor</Uri>
330330
<Sha>3372435431977e91904a23ceb1eab689badc1bd9</Sha>
331331
</Dependency>
332-
<Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="9.0.0-preview.25329.3">
332+
<Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="9.0.0-preview.25377.2">
333333
<Uri>https://github.com/dotnet/razor</Uri>
334334
<Sha>3372435431977e91904a23ceb1eab689badc1bd9</Sha>
335335
</Dependency>
336336
<!-- Intermediate is necessary for source build. -->
337-
<Dependency Name="Microsoft.SourceBuild.Intermediate.razor" Version="9.0.0-preview.25329.3">
337+
<Dependency Name="Microsoft.SourceBuild.Intermediate.razor" Version="9.0.0-preview.25377.2">
338338
<Uri>https://github.com/dotnet/razor</Uri>
339339
<Sha>3372435431977e91904a23ceb1eab689badc1bd9</Sha>
340340
<SourceBuild RepoName="razor" ManagedOnly="true" />
@@ -378,9 +378,9 @@
378378
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
379379
<Sha>433fa3e4a54010fcac6e8843460e29d33ba07eb7</Sha>
380380
</Dependency>
381-
<Dependency Name="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.12.0-beta1.25359.3">
381+
<Dependency Name="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.12.0-beta1.25404.3">
382382
<Uri>https://github.com/dotnet/roslyn</Uri>
383-
<Sha>6dbcfd2f553ef1ef0ac48878ab17d18c1360735d</Sha>
383+
<Sha>22348b23fcd770362ca1ed60c5ec3db22c9cabc7</Sha>
384384
</Dependency>
385385
<!-- Intermediate is necessary for source build. -->
386386
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn-analyzers" Version="9.0.0-preview.25329.4">
@@ -555,34 +555,34 @@
555555
</Dependency>
556556
</ProductDependencies>
557557
<ToolsetDependencies>
558-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25325.4">
558+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25406.1">
559559
<Uri>https://github.com/dotnet/arcade</Uri>
560-
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
560+
<Sha>cfad7219713eb776273d540fa1b65f1662fdf241</Sha>
561561
</Dependency>
562-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25325.4">
562+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25406.1">
563563
<Uri>https://github.com/dotnet/arcade</Uri>
564-
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
564+
<Sha>cfad7219713eb776273d540fa1b65f1662fdf241</Sha>
565565
</Dependency>
566-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25325.4">
566+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25406.1">
567567
<Uri>https://github.com/dotnet/arcade</Uri>
568-
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
568+
<Sha>cfad7219713eb776273d540fa1b65f1662fdf241</Sha>
569569
</Dependency>
570-
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25325.4">
570+
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25406.1">
571571
<Uri>https://github.com/dotnet/arcade</Uri>
572-
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
572+
<Sha>cfad7219713eb776273d540fa1b65f1662fdf241</Sha>
573573
</Dependency>
574-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25325.4">
574+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25406.1">
575575
<Uri>https://github.com/dotnet/arcade</Uri>
576-
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
576+
<Sha>cfad7219713eb776273d540fa1b65f1662fdf241</Sha>
577577
</Dependency>
578-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25325.4">
578+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25406.1">
579579
<Uri>https://github.com/dotnet/arcade</Uri>
580-
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
580+
<Sha>cfad7219713eb776273d540fa1b65f1662fdf241</Sha>
581581
</Dependency>
582582
<!-- Intermediate is necessary for source build. -->
583-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25325.4">
583+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25406.1">
584584
<Uri>https://github.com/dotnet/arcade</Uri>
585-
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
585+
<Sha>cfad7219713eb776273d540fa1b65f1662fdf241</Sha>
586586
<SourceBuild RepoName="arcade" ManagedOnly="true" />
587587
</Dependency>
588588
<Dependency Name="System.Reflection.MetadataLoadContext" Version="9.0.8">
@@ -597,14 +597,14 @@
597597
<Uri>https://github.com/dotnet/arcade-services</Uri>
598598
<Sha>e156e649f28395d9d0ee1e848225a689b59e0fd3</Sha>
599599
</Dependency>
600-
<Dependency Name="Microsoft.DotNet.ScenarioTests.SdkTemplateTests" Version="9.0.0-preview.25326.1">
600+
<Dependency Name="Microsoft.DotNet.ScenarioTests.SdkTemplateTests" Version="9.0.0-preview.25381.1">
601601
<Uri>https://github.com/dotnet/scenario-tests</Uri>
602-
<Sha>270606f9f338c1c2dfb255b6f18bbcb5f085a06c</Sha>
602+
<Sha>0898abbb5899ef400b8372913c2320295798a687</Sha>
603603
</Dependency>
604604
<!-- Intermediate is necessary for source build. -->
605-
<Dependency Name="Microsoft.SourceBuild.Intermediate.scenario-tests" Version="9.0.0-preview.25326.1">
605+
<Dependency Name="Microsoft.SourceBuild.Intermediate.scenario-tests" Version="9.0.0-preview.25381.1">
606606
<Uri>https://github.com/dotnet/scenario-tests</Uri>
607-
<Sha>270606f9f338c1c2dfb255b6f18bbcb5f085a06c</Sha>
607+
<Sha>0898abbb5899ef400b8372913c2320295798a687</Sha>
608608
<SourceBuild RepoName="scenario-tests" ManagedOnly="true" />
609609
</Dependency>
610610
<!--

0 commit comments

Comments
 (0)