Skip to content

Commit b9f86c1

Browse files
author
Mirroring
committed
Merge commit '5a7b13708aa9774738b031c4583a981cf425229f'
2 parents 8971bfc + 5a7b137 commit b9f86c1

File tree

3 files changed

+19
-17
lines changed

3 files changed

+19
-17
lines changed

‎NuGet.config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
<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" />
2323
<!-- End: Package sources from dotnet-aspnetcore -->
2424
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
25+
<add key="darc-pub-DotNet-msbuild-Trusted-7c2b926" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-7c2b9262/nuget/v3/index.json" />
2526
<!-- End: Package sources from DotNet-msbuild-Trusted -->
2627
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
2728
<!-- End: Package sources from dotnet-roslyn-analyzers -->
@@ -30,6 +31,7 @@
3031
<!-- End: Package sources from dotnet-runtime -->
3132
<!-- Begin: Package sources from dotnet-templating -->
3233
<add key="darc-pub-dotnet-templating-1bd9e10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-1bd9e103/nuget/v3/index.json" />
34+
<add key="darc-pub-dotnet-templating-1bd9e10-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-1bd9e103-1/nuget/v3/index.json" />
3335
<!-- End: Package sources from dotnet-templating -->
3436
<!-- Begin: Package sources from dotnet-windowsdesktop -->
3537
<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" />

‎eng/Version.Details.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,17 @@
5555
<Uri>https://github.com/dotnet/emsdk</Uri>
5656
<Sha>c458a7647c04e323c238f381eb176af24254b3ff</Sha>
5757
</Dependency>
58-
<Dependency Name="Microsoft.Build" Version="17.10.4">
58+
<Dependency Name="Microsoft.Build" Version="17.10.14">
5959
<Uri>https://github.com/dotnet/msbuild</Uri>
60-
<Sha>10fbfbf2eeb0597fdc1f600d87d38c7f57317bdc</Sha>
60+
<Sha>7c2b92622c44c2d0ad0cc9d9f5fa2796d0c5c81c</Sha>
6161
</Dependency>
62-
<Dependency Name="Microsoft.Build.Localization" Version="17.10.4-preview-24218-02">
62+
<Dependency Name="Microsoft.Build.Localization" Version="17.10.14-preview-24613-10">
6363
<Uri>https://github.com/dotnet/msbuild</Uri>
64-
<Sha>10fbfbf2eeb0597fdc1f600d87d38c7f57317bdc</Sha>
64+
<Sha>7c2b92622c44c2d0ad0cc9d9f5fa2796d0c5c81c</Sha>
6565
</Dependency>
66-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.10.4-preview-24218-02">
66+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.10.14-preview-24613-10">
6767
<Uri>https://github.com/dotnet/msbuild</Uri>
68-
<Sha>10fbfbf2eeb0597fdc1f600d87d38c7f57317bdc</Sha>
68+
<Sha>7c2b92622c44c2d0ad0cc9d9f5fa2796d0c5c81c</Sha>
6969
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
7070
</Dependency>
7171
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.301-beta.24271.6">
@@ -293,18 +293,18 @@
293293
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
294294
<Sha>31d685b2d9a86ca1243014d175a3da813f78e428</Sha>
295295
</Dependency>
296-
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="7.0.0-preview.24574.6">
296+
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="7.0.0-preview.24612.2">
297297
<Uri>https://github.com/dotnet/razor</Uri>
298-
<Sha>aa2c76f75e60f3f6ae500bbf0eae9eb11af0bd4f</Sha>
298+
<Sha>47a3872a73899ff683dc9593e587e539a1264233</Sha>
299299
<SourceBuild RepoName="razor" ManagedOnly="true" />
300300
</Dependency>
301-
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="7.0.0-preview.24574.6">
301+
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="7.0.0-preview.24612.2">
302302
<Uri>https://github.com/dotnet/razor</Uri>
303-
<Sha>aa2c76f75e60f3f6ae500bbf0eae9eb11af0bd4f</Sha>
303+
<Sha>47a3872a73899ff683dc9593e587e539a1264233</Sha>
304304
</Dependency>
305-
<Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="7.0.0-preview.24574.6">
305+
<Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="7.0.0-preview.24612.2">
306306
<Uri>https://github.com/dotnet/razor</Uri>
307-
<Sha>aa2c76f75e60f3f6ae500bbf0eae9eb11af0bd4f</Sha>
307+
<Sha>47a3872a73899ff683dc9593e587e539a1264233</Sha>
308308
</Dependency>
309309
<Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.12">
310310
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>

‎eng/Versions.props

Lines changed: 5 additions & 5 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.4</MicrosoftBuildPackageVersion>
127+
<MicrosoftBuildPackageVersion>17.10.14</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,7 +133,7 @@
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.4-preview-24218-02</MicrosoftBuildLocalizationPackageVersion>
136+
<MicrosoftBuildLocalizationPackageVersion>17.10.14-preview-24613-10</MicrosoftBuildLocalizationPackageVersion>
137137
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
138138
<MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildTasksCorePackageVersion>
139139
<MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildTasksCorePackageVersion)</MicrosoftBuildTasksCoreVersion>
@@ -179,9 +179,9 @@
179179
</PropertyGroup>
180180
<!-- Dependencies from https://github.com/dotnet/razor -->
181181
<PropertyGroup>
182-
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>7.0.0-preview.24574.6</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
183-
<MicrosoftCodeAnalysisRazorToolingInternalVersion>7.0.0-preview.24574.6</MicrosoftCodeAnalysisRazorToolingInternalVersion>
184-
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>7.0.0-preview.24574.6</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
182+
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>7.0.0-preview.24612.2</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
183+
<MicrosoftCodeAnalysisRazorToolingInternalVersion>7.0.0-preview.24612.2</MicrosoftCodeAnalysisRazorToolingInternalVersion>
184+
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>7.0.0-preview.24612.2</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
185185
</PropertyGroup>
186186
<PropertyGroup>
187187
<!-- Dependencies from https://github.com/dotnet/wpf -->

0 commit comments

Comments
 (0)