Skip to content

Commit ca52840

Browse files
author
Mirroring
committed
Merge commit '48f8744c63846102af0d53f807b7c568a778fa56'
2 parents 3572cea + 48f8744 commit ca52840

File tree

3 files changed

+25
-23
lines changed

3 files changed

+25
-23
lines changed

‎NuGet.config

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,14 @@
88
<!-- End: Package sources from dotnet-emsdk -->
99
<!-- Begin: Package sources from dotnet-format -->
1010
<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" />
11+
<add key="darc-pub-dotnet-format-42ef1d0-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-42ef1d04-2/nuget/v3/index.json" />
1112
<add key="darc-pub-dotnet-format-42ef1d0-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-42ef1d04-1/nuget/v3/index.json" />
1213
<!-- End: Package sources from dotnet-format -->
1314
<!-- Begin: Package sources from dotnet-aspnetcore -->
1415
<add key="darc-int-dotnet-aspnetcore-25ef4aa" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-25ef4aa3/nuget/v3/index.json" />
1516
<!-- End: Package sources from dotnet-aspnetcore -->
1617
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
17-
<add key="darc-pub-DotNet-msbuild-Trusted-0e18be8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-0e18be81/nuget/v3/index.json" />
18+
<add key="darc-pub-DotNet-msbuild-Trusted-f305233" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-f3052339/nuget/v3/index.json" />
1819
<!-- End: Package sources from DotNet-msbuild-Trusted -->
1920
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
2021
<!-- End: Package sources from dotnet-roslyn-analyzers -->
@@ -24,6 +25,7 @@
2425
<!-- Begin: Package sources from dotnet-templating -->
2526
<add key="darc-pub-dotnet-templating-ad439b8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ad439b89/nuget/v3/index.json" />
2627
<add key="darc-pub-dotnet-templating-ad439b8-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ad439b89-1/nuget/v3/index.json" />
28+
<add key="darc-pub-dotnet-templating-488c525" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-488c525e/nuget/v3/index.json" />
2729
<!-- End: Package sources from dotnet-templating -->
2830
<!-- Begin: Package sources from dotnet-windowsdesktop -->
2931
<add key="darc-int-dotnet-windowsdesktop-8506c0d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-8506c0d8/nuget/v3/index.json" />

‎eng/Version.Details.xml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.310">
4+
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.311">
55
<Uri>https://github.com/dotnet/templating</Uri>
6-
<Sha>ad439b89ee9586ae7a730c8eda5a1b078cdcc61d</Sha>
6+
<Sha>488c525e279e7ff5540f99ae4050489fb61356da</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.310-servicing.25112.1">
8+
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.311-servicing.25156.11">
99
<Uri>https://github.com/dotnet/templating</Uri>
10-
<Sha>ad439b89ee9586ae7a730c8eda5a1b078cdcc61d</Sha>
10+
<Sha>488c525e279e7ff5540f99ae4050489fb61356da</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.310-servicing.25112.1">
12+
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.311-servicing.25156.11">
1313
<Uri>https://github.com/dotnet/templating</Uri>
14-
<Sha>ad439b89ee9586ae7a730c8eda5a1b078cdcc61d</Sha>
14+
<Sha>488c525e279e7ff5540f99ae4050489fb61356da</Sha>
1515
<SourceBuild RepoName="templating" ManagedOnly="true" />
1616
</Dependency>
1717
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.14">
@@ -55,17 +55,17 @@
5555
<Uri>https://github.com/dotnet/emsdk</Uri>
5656
<Sha>ec84e775d21d3b7a6698ec30f7b2a5a9e3acd314</Sha>
5757
</Dependency>
58-
<Dependency Name="Microsoft.Build" Version="17.10.21">
58+
<Dependency Name="Microsoft.Build" Version="17.10.23">
5959
<Uri>https://github.com/dotnet/msbuild</Uri>
60-
<Sha>0e18be81c1881b24619dd1239afca022aeff1eef</Sha>
60+
<Sha>f3052339bec221fe67339242439d2b960674265d</Sha>
6161
</Dependency>
62-
<Dependency Name="Microsoft.Build.Localization" Version="17.10.21-preview-25111-03">
62+
<Dependency Name="Microsoft.Build.Localization" Version="17.10.23-preview-25121-03">
6363
<Uri>https://github.com/dotnet/msbuild</Uri>
64-
<Sha>0e18be81c1881b24619dd1239afca022aeff1eef</Sha>
64+
<Sha>f3052339bec221fe67339242439d2b960674265d</Sha>
6565
</Dependency>
66-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.10.21-preview-25111-03">
66+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.10.23-preview-25121-03">
6767
<Uri>https://github.com/dotnet/msbuild</Uri>
68-
<Sha>0e18be81c1881b24619dd1239afca022aeff1eef</Sha>
68+
<Sha>f3052339bec221fe67339242439d2b960674265d</Sha>
6969
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
7070
</Dependency>
7171
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.301-beta.24271.6">
@@ -293,16 +293,16 @@
293293
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
294294
<Sha>25ef4aa38b77974263cb10f6e9cbd10135f17b59</Sha>
295295
</Dependency>
296-
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="7.0.0-preview.25104.5">
296+
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="7.0.0-preview.25123.3">
297297
<Uri>https://github.com/dotnet/razor</Uri>
298298
<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.25104.5">
301+
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="7.0.0-preview.25123.3">
302302
<Uri>https://github.com/dotnet/razor</Uri>
303303
<Sha>291218a1671cc18216b6fc93204619d761515011</Sha>
304304
</Dependency>
305-
<Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="7.0.0-preview.25104.5">
305+
<Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="7.0.0-preview.25123.3">
306306
<Uri>https://github.com/dotnet/razor</Uri>
307307
<Sha>291218a1671cc18216b6fc93204619d761515011</Sha>
308308
</Dependency>

‎eng/Versions.props

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
</PropertyGroup>
125125
<PropertyGroup>
126126
<!-- Dependencies from https://github.com/Microsoft/msbuild -->
127-
<MicrosoftBuildPackageVersion>17.10.21</MicrosoftBuildPackageVersion>
127+
<MicrosoftBuildPackageVersion>17.10.23</MicrosoftBuildPackageVersion>
128128
<MicrosoftBuildCurrentPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildCurrentPackageVersion>
129129
<!-- Some tasks and the resolver will need to run in an MSBuild that is older than the very latest,
130130
so target one that matches the version in minimumMSBuildVersion.
@@ -133,21 +133,21 @@
133133
<MicrosoftBuildPackageVersion Condition="exists('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion') and '$(DotNetBuildFromSource)' != 'true'">$([System.IO.File]::ReadAllText('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildPackageVersion>
134134
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
135135
<MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildRuntimePackageVersion>
136-
<MicrosoftBuildLocalizationPackageVersion>17.10.21-preview-25111-03</MicrosoftBuildLocalizationPackageVersion>
136+
<MicrosoftBuildLocalizationPackageVersion>17.10.23-preview-25121-03</MicrosoftBuildLocalizationPackageVersion>
137137
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
138138
<MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildTasksCorePackageVersion>
139139
<MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildTasksCorePackageVersion)</MicrosoftBuildTasksCoreVersion>
140140
<MicrosoftNETStringToolsPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftNETStringToolsPackageVersion>
141141
</PropertyGroup>
142142
<PropertyGroup>
143143
<!-- Dependencies from https://github.com/dotnet/templating -->
144-
<MicrosoftTemplateEngineAbstractionsPackageVersion>8.0.310</MicrosoftTemplateEngineAbstractionsPackageVersion>
144+
<MicrosoftTemplateEngineAbstractionsPackageVersion>8.0.311</MicrosoftTemplateEngineAbstractionsPackageVersion>
145145
<MicrosoftTemplateEngineEdgePackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineEdgePackageVersion>
146146
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
147147
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
148148
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
149149
<!-- test dependencies -->
150-
<MicrosoftTemplateEngineMocksPackageVersion>8.0.310-servicing.25112.1</MicrosoftTemplateEngineMocksPackageVersion>
150+
<MicrosoftTemplateEngineMocksPackageVersion>8.0.311-servicing.25156.11</MicrosoftTemplateEngineMocksPackageVersion>
151151
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
152152
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
153153
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>
@@ -179,9 +179,9 @@
179179
</PropertyGroup>
180180
<!-- Dependencies from https://github.com/dotnet/razor -->
181181
<PropertyGroup>
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>
182+
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>7.0.0-preview.25123.3</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
183+
<MicrosoftCodeAnalysisRazorToolingInternalVersion>7.0.0-preview.25123.3</MicrosoftCodeAnalysisRazorToolingInternalVersion>
184+
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>7.0.0-preview.25123.3</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
185185
</PropertyGroup>
186186
<PropertyGroup>
187187
<!-- Dependencies from https://github.com/dotnet/wpf -->

0 commit comments

Comments
 (0)