Skip to content

Commit 3a05842

Browse files
author
Simon Zhao (BEYONDSOFT CONSULTING INC)
committed
Merge branch 'release/9.0.3xx' of https://github.com/dotnet/sdk into merge/release/9.0.1xx-to-release/9.0.3xx
2 parents f355405 + 5f2d07c commit 3a05842

File tree

3 files changed

+21
-49
lines changed

3 files changed

+21
-49
lines changed

‎NuGet.config

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -24,36 +24,20 @@
2424
<!-- Begin: Package sources from dotnet-aspire -->
2525
<!-- End: Package sources from dotnet-aspire -->
2626
<!-- Begin: Package sources from dotnet-aspnetcore -->
27-
<add key="darc-int-dotnet-aspnetcore-f6b3a5d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-f6b3a5da/nuget/v3/index.json" />
28-
<add key="darc-int-dotnet-aspnetcore-f6b3a5d-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-f6b3a5da-3/nuget/v3/index.json" />
29-
<add key="darc-int-dotnet-aspnetcore-f6b3a5d-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-f6b3a5da-2/nuget/v3/index.json" />
30-
<add key="darc-int-dotnet-aspnetcore-f6b3a5d-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-f6b3a5da-1/nuget/v3/index.json" />
3127
<!-- End: Package sources from dotnet-aspnetcore -->
3228
<!-- Begin: Package sources from dotnet-emsdk -->
33-
<add key="darc-pub-dotnet-emsdk-b567cdb" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-b567cdb6/nuget/v3/index.json" />
34-
<add key="darc-pub-dotnet-emsdk-b567cdb-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-b567cdb6-3/nuget/v3/index.json" />
35-
<add key="darc-pub-dotnet-emsdk-b567cdb-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-b567cdb6-2/nuget/v3/index.json" />
36-
<add key="darc-pub-dotnet-emsdk-b567cdb-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-b567cdb6-1/nuget/v3/index.json" />
3729
<!-- End: Package sources from dotnet-emsdk -->
3830
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
39-
<add key="darc-pub-DotNet-msbuild-Trusted-d21f833" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-d21f833b/nuget/v3/index.json" />
31+
<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" />
4032
<!-- End: Package sources from DotNet-msbuild-Trusted -->
4133
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
4234
<!-- End: Package sources from dotnet-roslyn-analyzers -->
4335
<!-- Begin: Package sources from dotnet-runtime -->
44-
<add key="darc-int-dotnet-runtime-3c298d9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-3c298d9f/nuget/v3/index.json" />
45-
<add key="darc-int-dotnet-runtime-3c298d9-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-3c298d9f-3/nuget/v3/index.json" />
46-
<add key="darc-int-dotnet-runtime-3c298d9-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-3c298d9f-2/nuget/v3/index.json" />
47-
<add key="darc-int-dotnet-runtime-3c298d9-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-3c298d9f-1/nuget/v3/index.json" />
4836
<!-- End: Package sources from dotnet-runtime -->
4937
<!-- Begin: Package sources from dotnet-templating -->
50-
<add key="darc-pub-dotnet-templating-f207089" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f207089d/nuget/v3/index.json" />
38+
<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" />
5139
<!-- End: Package sources from dotnet-templating -->
5240
<!-- Begin: Package sources from dotnet-windowsdesktop -->
53-
<add key="darc-int-dotnet-windowsdesktop-bd9e6e9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-bd9e6e96/nuget/v3/index.json" />
54-
<add key="darc-int-dotnet-windowsdesktop-bd9e6e9-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-bd9e6e96-3/nuget/v3/index.json" />
55-
<add key="darc-int-dotnet-windowsdesktop-bd9e6e9-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-bd9e6e96-2/nuget/v3/index.json" />
56-
<add key="darc-int-dotnet-windowsdesktop-bd9e6e9-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-bd9e6e96-1/nuget/v3/index.json" />
5741
<!-- End: Package sources from dotnet-windowsdesktop -->
5842
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
5943
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -84,22 +68,10 @@
8468
<!-- Begin: Package sources from dotnet-templating -->
8569
<!-- End: Package sources from dotnet-templating -->
8670
<!-- Begin: Package sources from dotnet-aspnetcore -->
87-
<add key="darc-int-dotnet-aspnetcore-f6b3a5d-1" value="true" />
88-
<add key="darc-int-dotnet-aspnetcore-f6b3a5d-2" value="true" />
89-
<add key="darc-int-dotnet-aspnetcore-f6b3a5d-3" value="true" />
90-
<add key="darc-int-dotnet-aspnetcore-f6b3a5d" value="true" />
9171
<!-- End: Package sources from dotnet-aspnetcore -->
9272
<!-- Begin: Package sources from dotnet-runtime -->
93-
<add key="darc-int-dotnet-runtime-3c298d9-1" value="true" />
94-
<add key="darc-int-dotnet-runtime-3c298d9-2" value="true" />
95-
<add key="darc-int-dotnet-runtime-3c298d9-3" value="true" />
96-
<add key="darc-int-dotnet-runtime-3c298d9" value="true" />
9773
<!-- End: Package sources from dotnet-runtime -->
9874
<!-- Begin: Package sources from dotnet-windowsdesktop -->
99-
<add key="darc-int-dotnet-windowsdesktop-bd9e6e9-1" value="true" />
100-
<add key="darc-int-dotnet-windowsdesktop-bd9e6e9-2" value="true" />
101-
<add key="darc-int-dotnet-windowsdesktop-bd9e6e9-3" value="true" />
102-
<add key="darc-int-dotnet-windowsdesktop-bd9e6e9" value="true" />
10375
<!-- End: Package sources from dotnet-windowsdesktop -->
10476
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
10577
</disabledPackageSources>

‎eng/Version.Details.xml

Lines changed: 14 additions & 14 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.303">
4+
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="9.0.304">
55
<Uri>https://github.com/dotnet/templating</Uri>
6-
<Sha>f207089d6b559bede41540cc5b2eb35debca17dc</Sha>
6+
<Sha>349a1a14fad0af1a3b455c694da7fdc0cec63d60</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="9.0.303-servicing.25353.9">
8+
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="9.0.304-servicing.25364.1">
99
<Uri>https://github.com/dotnet/templating</Uri>
10-
<Sha>f207089d6b559bede41540cc5b2eb35debca17dc</Sha>
10+
<Sha>349a1a14fad0af1a3b455c694da7fdc0cec63d60</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,28 +69,28 @@
6969
<Sha>b567cdb6b8b461de79f2a2536a22ca3a67f2f33e</Sha>
7070
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
7171
</Dependency>
72-
<Dependency Name="Microsoft.Build" Version="17.14.15">
72+
<Dependency Name="Microsoft.Build" Version="17.14.16">
7373
<Uri>https://github.com/dotnet/msbuild</Uri>
74-
<Sha>d21f833b9027346d36a311d538320d58ab7a8895</Sha>
74+
<Sha>5d8159c5fa474b60b0c1e5159b0dd054a102ee8a</Sha>
7575
</Dependency>
76-
<Dependency Name="Microsoft.Build.Localization" Version="17.14.15-servicing-25353-03">
76+
<Dependency Name="Microsoft.Build.Localization" Version="17.14.16-servicing-25360-01">
7777
<Uri>https://github.com/dotnet/msbuild</Uri>
78-
<Sha>d21f833b9027346d36a311d538320d58ab7a8895</Sha>
78+
<Sha>5d8159c5fa474b60b0c1e5159b0dd054a102ee8a</Sha>
7979
</Dependency>
8080
<!-- Intermediate is necessary for source build. -->
81-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.14.15-servicing-25353-03">
81+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.14.16-servicing-25360-01">
8282
<Uri>https://github.com/dotnet/msbuild</Uri>
83-
<Sha>d21f833b9027346d36a311d538320d58ab7a8895</Sha>
83+
<Sha>5d8159c5fa474b60b0c1e5159b0dd054a102ee8a</Sha>
8484
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
8585
</Dependency>
86-
<Dependency Name="Microsoft.FSharp.Compiler" Version="13.9.300-beta.25228.3">
86+
<Dependency Name="Microsoft.FSharp.Compiler" Version="13.9.303-beta.25361.1">
8787
<Uri>https://github.com/dotnet/fsharp</Uri>
88-
<Sha>c1ce3cebbbf5e46205dd5c60a0d379a412703eae</Sha>
88+
<Sha>14987c804f33917bf15f4c25e0cd16ecd01807f4</Sha>
8989
</Dependency>
9090
<!-- Intermediate is necessary for source build. -->
91-
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="9.0.300-beta.25228.3">
91+
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="9.0.303-beta.25361.1">
9292
<Uri>https://github.com/dotnet/fsharp</Uri>
93-
<Sha>c1ce3cebbbf5e46205dd5c60a0d379a412703eae</Sha>
93+
<Sha>14987c804f33917bf15f4c25e0cd16ecd01807f4</Sha>
9494
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
9595
</Dependency>
9696
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.14.0-3.25359.3">

‎eng/Versions.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -182,27 +182,27 @@
182182
At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes.
183183
184184
Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent -->
185-
<MicrosoftBuildVersion>17.14.15</MicrosoftBuildVersion>
186-
<MicrosoftBuildLocalizationVersion>17.14.15-servicing-25353-03</MicrosoftBuildLocalizationVersion>
185+
<MicrosoftBuildVersion>17.14.16</MicrosoftBuildVersion>
186+
<MicrosoftBuildLocalizationVersion>17.14.16-servicing-25360-01</MicrosoftBuildLocalizationVersion>
187187
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.11.31</MicrosoftBuildMinimumVersion>
188188
<MinimumVSVersion>17.12</MinimumVSVersion>
189189
</PropertyGroup>
190190
<PropertyGroup>
191191
<!-- Dependencies from https://github.com/dotnet/templating -->
192-
<MicrosoftTemplateEngineAbstractionsPackageVersion>9.0.303</MicrosoftTemplateEngineAbstractionsPackageVersion>
192+
<MicrosoftTemplateEngineAbstractionsPackageVersion>9.0.304</MicrosoftTemplateEngineAbstractionsPackageVersion>
193193
<MicrosoftTemplateEngineEdgePackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineEdgePackageVersion>
194194
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
195195
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
196196
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
197197
<!-- test dependencies -->
198-
<MicrosoftTemplateEngineMocksPackageVersion>9.0.303-servicing.25353.9</MicrosoftTemplateEngineMocksPackageVersion>
198+
<MicrosoftTemplateEngineMocksPackageVersion>9.0.304-servicing.25364.1</MicrosoftTemplateEngineMocksPackageVersion>
199199
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
200200
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
201201
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>
202202
</PropertyGroup>
203203
<PropertyGroup>
204204
<!-- Dependencies from https://github.com/Microsoft/visualfsharp -->
205-
<MicrosoftFSharpCompilerPackageVersion>13.9.300-beta.25228.3</MicrosoftFSharpCompilerPackageVersion>
205+
<MicrosoftFSharpCompilerPackageVersion>13.9.303-beta.25361.1</MicrosoftFSharpCompilerPackageVersion>
206206
</PropertyGroup>
207207
<PropertyGroup>
208208
<!-- Dependencies from https://github.com/dotnet/roslyn -->

0 commit comments

Comments
 (0)