Skip to content

Commit 141d0ba

Browse files
author
Simon Zhao (BEYONDSOFT CONSULTING INC)
committed
Merge branch 'release/9.0.1xx' of https://github.com/dotnet/sdk into darc-release/9.0.1xx-debf76ba-d4b8-48f1-941c-af06d2d16e89
2 parents 2c7be56 + 1aa18fb commit 141d0ba

File tree

3 files changed

+36
-39
lines changed

3 files changed

+36
-39
lines changed

‎NuGet.config‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,7 @@
4545
<add key="darc-int-dotnet-runtime-aae90fa-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-aae90fa0-1/nuget/v3/index.json" />
4646
<!-- End: Package sources from dotnet-runtime -->
4747
<!-- Begin: Package sources from dotnet-templating -->
48-
<add key="darc-pub-dotnet-templating-861f0ec" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-861f0ec3/nuget/v3/index.json" />
49-
<add key="darc-pub-dotnet-templating-861f0ec-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-861f0ec3-3/nuget/v3/index.json" />
50-
<add key="darc-pub-dotnet-templating-861f0ec-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-861f0ec3-2/nuget/v3/index.json" />
51-
<add key="darc-pub-dotnet-templating-861f0ec-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-861f0ec3-1/nuget/v3/index.json" />
48+
<add key="darc-pub-dotnet-templating-2fc4beb" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-2fc4beb0/nuget/v3/index.json" />
5249
<!-- End: Package sources from dotnet-templating -->
5350
<!-- Begin: Package sources from dotnet-windowsdesktop -->
5451
<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: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="9.0.109">
4+
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="9.0.110">
55
<Uri>https://github.com/dotnet/templating</Uri>
6-
<Sha>861f0ec3ba5ef218964c95949818e9f33eacf8f0</Sha>
6+
<Sha>2fc4beb0693bb53e83c73e7ce4cf37dd74991fda</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="9.0.109-servicing.25353.8">
8+
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="9.0.110-servicing.25405.3">
99
<Uri>https://github.com/dotnet/templating</Uri>
10-
<Sha>861f0ec3ba5ef218964c95949818e9f33eacf8f0</Sha>
10+
<Sha>2fc4beb0693bb53e83c73e7ce4cf37dd74991fda</Sha>
1111
</Dependency>
1212
<!-- Intermediate is necessary for source build. -->
13-
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="9.0.109-servicing.25353.8">
13+
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="9.0.110-servicing.25405.3">
1414
<Uri>https://github.com/dotnet/templating</Uri>
15-
<Sha>861f0ec3ba5ef218964c95949818e9f33eacf8f0</Sha>
15+
<Sha>2fc4beb0693bb53e83c73e7ce4cf37dd74991fda</Sha>
1616
<SourceBuild RepoName="templating" ManagedOnly="true" />
1717
</Dependency>
1818
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.8">
@@ -147,68 +147,68 @@
147147
<Uri>https://github.com/nuget/nuget.client</Uri>
148148
<Sha>42bfb4554167e1d2fc2b950728d9bd8164f806c1</Sha>
149149
</Dependency>
150-
<Dependency Name="NuGet.Build.Tasks" Version="6.12.4-rc.9">
150+
<Dependency Name="NuGet.Build.Tasks" Version="6.12.4">
151151
<Uri>https://github.com/nuget/nuget.client</Uri>
152152
<Sha>42bfb4554167e1d2fc2b950728d9bd8164f806c1</Sha>
153153
<SourceBuildTarball RepoName="nuget-client" ManagedOnly="true" />
154154
</Dependency>
155-
<Dependency Name="NuGet.Build.Tasks.Console" Version="6.12.4-rc.9">
155+
<Dependency Name="NuGet.Build.Tasks.Console" Version="6.12.4">
156156
<Uri>https://github.com/nuget/nuget.client</Uri>
157157
<Sha>42bfb4554167e1d2fc2b950728d9bd8164f806c1</Sha>
158158
</Dependency>
159-
<Dependency Name="NuGet.Build.Tasks.Pack" Version="6.12.4-rc.9">
159+
<Dependency Name="NuGet.Build.Tasks.Pack" Version="6.12.4">
160160
<Uri>https://github.com/nuget/nuget.client</Uri>
161161
<Sha>42bfb4554167e1d2fc2b950728d9bd8164f806c1</Sha>
162162
</Dependency>
163-
<Dependency Name="NuGet.Commands" Version="6.12.4-rc.9">
163+
<Dependency Name="NuGet.Commands" Version="6.12.4">
164164
<Uri>https://github.com/nuget/nuget.client</Uri>
165165
<Sha>42bfb4554167e1d2fc2b950728d9bd8164f806c1</Sha>
166166
</Dependency>
167-
<Dependency Name="NuGet.CommandLine.XPlat" Version="6.12.4-rc.9">
167+
<Dependency Name="NuGet.CommandLine.XPlat" Version="6.12.4">
168168
<Uri>https://github.com/nuget/nuget.client</Uri>
169169
<Sha>42bfb4554167e1d2fc2b950728d9bd8164f806c1</Sha>
170170
</Dependency>
171-
<Dependency Name="NuGet.Common" Version="6.12.4-rc.9">
171+
<Dependency Name="NuGet.Common" Version="6.12.4">
172172
<Uri>https://github.com/nuget/nuget.client</Uri>
173173
<Sha>42bfb4554167e1d2fc2b950728d9bd8164f806c1</Sha>
174174
</Dependency>
175-
<Dependency Name="NuGet.Configuration" Version="6.12.4-rc.9">
175+
<Dependency Name="NuGet.Configuration" Version="6.12.4">
176176
<Uri>https://github.com/nuget/nuget.client</Uri>
177177
<Sha>42bfb4554167e1d2fc2b950728d9bd8164f806c1</Sha>
178178
</Dependency>
179-
<Dependency Name="NuGet.Credentials" Version="6.12.4-rc.9">
179+
<Dependency Name="NuGet.Credentials" Version="6.12.4">
180180
<Uri>https://github.com/nuget/nuget.client</Uri>
181181
<Sha>42bfb4554167e1d2fc2b950728d9bd8164f806c1</Sha>
182182
</Dependency>
183-
<Dependency Name="NuGet.DependencyResolver.Core" Version="6.12.4-rc.9">
183+
<Dependency Name="NuGet.DependencyResolver.Core" Version="6.12.4">
184184
<Uri>https://github.com/nuget/nuget.client</Uri>
185185
<Sha>42bfb4554167e1d2fc2b950728d9bd8164f806c1</Sha>
186186
</Dependency>
187-
<Dependency Name="NuGet.Frameworks" Version="6.12.4-rc.9">
187+
<Dependency Name="NuGet.Frameworks" Version="6.12.4">
188188
<Uri>https://github.com/nuget/nuget.client</Uri>
189189
<Sha>42bfb4554167e1d2fc2b950728d9bd8164f806c1</Sha>
190190
</Dependency>
191-
<Dependency Name="NuGet.LibraryModel" Version="6.12.4-rc.9">
191+
<Dependency Name="NuGet.LibraryModel" Version="6.12.4">
192192
<Uri>https://github.com/nuget/nuget.client</Uri>
193193
<Sha>42bfb4554167e1d2fc2b950728d9bd8164f806c1</Sha>
194194
</Dependency>
195-
<Dependency Name="NuGet.ProjectModel" Version="6.12.4-rc.9">
195+
<Dependency Name="NuGet.ProjectModel" Version="6.12.4">
196196
<Uri>https://github.com/nuget/nuget.client</Uri>
197197
<Sha>42bfb4554167e1d2fc2b950728d9bd8164f806c1</Sha>
198198
</Dependency>
199-
<Dependency Name="NuGet.Protocol" Version="6.12.4-rc.9">
199+
<Dependency Name="NuGet.Protocol" Version="6.12.4">
200200
<Uri>https://github.com/nuget/nuget.client</Uri>
201201
<Sha>42bfb4554167e1d2fc2b950728d9bd8164f806c1</Sha>
202202
</Dependency>
203-
<Dependency Name="NuGet.Packaging" Version="6.12.4-rc.9">
203+
<Dependency Name="NuGet.Packaging" Version="6.12.4">
204204
<Uri>https://github.com/nuget/nuget.client</Uri>
205205
<Sha>42bfb4554167e1d2fc2b950728d9bd8164f806c1</Sha>
206206
</Dependency>
207-
<Dependency Name="NuGet.Versioning" Version="6.12.4-rc.9">
207+
<Dependency Name="NuGet.Versioning" Version="6.12.4">
208208
<Uri>https://github.com/nuget/nuget.client</Uri>
209209
<Sha>42bfb4554167e1d2fc2b950728d9bd8164f806c1</Sha>
210210
</Dependency>
211-
<Dependency Name="NuGet.Localization" Version="6.12.4-rc.9">
211+
<Dependency Name="NuGet.Localization" Version="6.12.4">
212212
<Uri>https://github.com/nuget/nuget.client</Uri>
213213
<Sha>42bfb4554167e1d2fc2b950728d9bd8164f806c1</Sha>
214214
</Dependency>

‎eng/Versions.props‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -137,18 +137,18 @@
137137
</PropertyGroup>
138138
<PropertyGroup>
139139
<!-- Dependencies from https://github.com/nuget/nuget.client -->
140-
<NuGetBuildTasksPackageVersion>6.12.4-rc.9</NuGetBuildTasksPackageVersion>
141-
<NuGetBuildTasksConsolePackageVersion>6.12.4-rc.9</NuGetBuildTasksConsolePackageVersion>
142-
<NuGetLocalizationPackageVersion>6.12.4-rc.9</NuGetLocalizationPackageVersion>
143-
<NuGetBuildTasksPackPackageVersion>6.12.4-rc.9</NuGetBuildTasksPackPackageVersion>
144-
<NuGetCommandLineXPlatPackageVersion>6.12.4-rc.9</NuGetCommandLineXPlatPackageVersion>
145-
<NuGetProjectModelPackageVersion>6.12.4-rc.9</NuGetProjectModelPackageVersion>
140+
<NuGetBuildTasksPackageVersion>6.12.4</NuGetBuildTasksPackageVersion>
141+
<NuGetBuildTasksConsolePackageVersion>6.12.4</NuGetBuildTasksConsolePackageVersion>
142+
<NuGetLocalizationPackageVersion>6.12.4</NuGetLocalizationPackageVersion>
143+
<NuGetBuildTasksPackPackageVersion>6.12.4</NuGetBuildTasksPackPackageVersion>
144+
<NuGetCommandLineXPlatPackageVersion>6.12.4</NuGetCommandLineXPlatPackageVersion>
145+
<NuGetProjectModelPackageVersion>6.12.4</NuGetProjectModelPackageVersion>
146146
<MicrosoftBuildNuGetSdkResolverPackageVersion>6.12.4-rc.9</MicrosoftBuildNuGetSdkResolverPackageVersion>
147-
<NuGetCommonPackageVersion>6.12.4-rc.9</NuGetCommonPackageVersion>
148-
<NuGetConfigurationPackageVersion>6.12.4-rc.9</NuGetConfigurationPackageVersion>
149-
<NuGetFrameworksPackageVersion>6.12.4-rc.9</NuGetFrameworksPackageVersion>
150-
<NuGetPackagingPackageVersion>6.12.4-rc.9</NuGetPackagingPackageVersion>
151-
<NuGetVersioningPackageVersion>6.12.4-rc.9</NuGetVersioningPackageVersion>
147+
<NuGetCommonPackageVersion>6.12.4</NuGetCommonPackageVersion>
148+
<NuGetConfigurationPackageVersion>6.12.4</NuGetConfigurationPackageVersion>
149+
<NuGetFrameworksPackageVersion>6.12.4</NuGetFrameworksPackageVersion>
150+
<NuGetPackagingPackageVersion>6.12.4</NuGetPackagingPackageVersion>
151+
<NuGetVersioningPackageVersion>6.12.4</NuGetVersioningPackageVersion>
152152
</PropertyGroup>
153153
<PropertyGroup>
154154
<!-- Dependencies from https://github.com/Microsoft/vstest -->
@@ -187,13 +187,13 @@
187187
</PropertyGroup>
188188
<PropertyGroup>
189189
<!-- Dependencies from https://github.com/dotnet/templating -->
190-
<MicrosoftTemplateEngineAbstractionsPackageVersion>9.0.109</MicrosoftTemplateEngineAbstractionsPackageVersion>
190+
<MicrosoftTemplateEngineAbstractionsPackageVersion>9.0.110</MicrosoftTemplateEngineAbstractionsPackageVersion>
191191
<MicrosoftTemplateEngineEdgePackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineEdgePackageVersion>
192192
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
193193
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
194194
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
195195
<!-- test dependencies -->
196-
<MicrosoftTemplateEngineMocksPackageVersion>9.0.109-servicing.25353.8</MicrosoftTemplateEngineMocksPackageVersion>
196+
<MicrosoftTemplateEngineMocksPackageVersion>9.0.110-servicing.25405.3</MicrosoftTemplateEngineMocksPackageVersion>
197197
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
198198
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
199199
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>

0 commit comments

Comments
 (0)