Skip to content

Commit c8214c0

Browse files
author
Simon Zhao (BEYONDSOFT CONSULTING INC)
committed
Merge branch 'release/8.0.1xx' of https://github.com/dotnet/sdk into darc-release/8.0.1xx-69428012-e5d0-4cc1-87fe-8c9d62aeb7f1
2 parents 6ec94b6 + 710cbb1 commit c8214c0

File tree

3 files changed

+18
-21
lines changed

3 files changed

+18
-21
lines changed

‎NuGet.config

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,14 @@
1414
<!-- Begin: Package sources from dotnet-aspnetcore -->
1515
<!-- End: Package sources from dotnet-aspnetcore -->
1616
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
17-
<add key="darc-pub-DotNet-msbuild-Trusted-74df0b3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-74df0b3f/nuget/v3/index.json" />
17+
<add key="darc-pub-DotNet-msbuild-Trusted-a0194b4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-a0194b4a/nuget/v3/index.json" />
1818
<!-- End: Package sources from DotNet-msbuild-Trusted -->
1919
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
2020
<!-- End: Package sources from dotnet-roslyn-analyzers -->
2121
<!-- Begin: Package sources from dotnet-runtime -->
2222
<!-- End: Package sources from dotnet-runtime -->
2323
<!-- Begin: Package sources from dotnet-templating -->
24-
<add key="darc-pub-dotnet-templating-a767f5a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-a767f5ab/nuget/v3/index.json" />
25-
<add key="darc-pub-dotnet-templating-a767f5a-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-a767f5ab-3/nuget/v3/index.json" />
26-
<add key="darc-pub-dotnet-templating-a767f5a-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-a767f5ab-2/nuget/v3/index.json" />
27-
<add key="darc-pub-dotnet-templating-a767f5a-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-a767f5ab-1/nuget/v3/index.json" />
24+
<add key="darc-pub-dotnet-templating-855483d" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-855483d2/nuget/v3/index.json" />
2825
<!-- End: Package sources from dotnet-templating -->
2926
<!-- Begin: Package sources from dotnet-windowsdesktop -->
3027
<!-- End: Package sources from dotnet-windowsdesktop -->

‎eng/Version.Details.xml

Lines changed: 12 additions & 12 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.119">
4+
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.120">
55
<Uri>https://github.com/dotnet/templating</Uri>
6-
<Sha>a767f5ab3b1b19ed4ffca966caf040cff2da4c61</Sha>
6+
<Sha>855483d28bd60fcb6e1f1f155828e8da8a46dee7</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.119-servicing.25353.1">
8+
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.120-servicing.25404.9">
99
<Uri>https://github.com/dotnet/templating</Uri>
10-
<Sha>a767f5ab3b1b19ed4ffca966caf040cff2da4c61</Sha>
10+
<Sha>855483d28bd60fcb6e1f1f155828e8da8a46dee7</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.119-servicing.25353.1">
12+
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.120-servicing.25404.9">
1313
<Uri>https://github.com/dotnet/templating</Uri>
14-
<Sha>a767f5ab3b1b19ed4ffca966caf040cff2da4c61</Sha>
14+
<Sha>855483d28bd60fcb6e1f1f155828e8da8a46dee7</Sha>
1515
<SourceBuild RepoName="templating" ManagedOnly="true" />
1616
</Dependency>
1717
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.18">
@@ -55,17 +55,17 @@
5555
<Uri>https://github.com/dotnet/emsdk</Uri>
5656
<Sha>976b101e5539557c20e2ac39885ac879531bcf82</Sha>
5757
</Dependency>
58-
<Dependency Name="Microsoft.Build" Version="17.8.32">
58+
<Dependency Name="Microsoft.Build" Version="17.8.34">
5959
<Uri>https://github.com/dotnet/msbuild</Uri>
60-
<Sha>74df0b3f5a40864840fb8d7d597631ffcfd5215a</Sha>
60+
<Sha>a0194b4a44352e26cd9fcbdb97c80a2158d1d3d9</Sha>
6161
</Dependency>
62-
<Dependency Name="Microsoft.Build.Localization" Version="17.8.32-servicing-25352-05">
62+
<Dependency Name="Microsoft.Build.Localization" Version="17.8.34-servicing-25404-06">
6363
<Uri>https://github.com/dotnet/msbuild</Uri>
64-
<Sha>74df0b3f5a40864840fb8d7d597631ffcfd5215a</Sha>
64+
<Sha>a0194b4a44352e26cd9fcbdb97c80a2158d1d3d9</Sha>
6565
</Dependency>
66-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.8.32-servicing-25352-05">
66+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.8.34-servicing-25404-06">
6767
<Uri>https://github.com/dotnet/msbuild</Uri>
68-
<Sha>74df0b3f5a40864840fb8d7d597631ffcfd5215a</Sha>
68+
<Sha>a0194b4a44352e26cd9fcbdb97c80a2158d1d3d9</Sha>
6969
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
7070
</Dependency>
7171
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.102-beta.24081.2">

‎eng/Versions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123
</PropertyGroup>
124124
<PropertyGroup>
125125
<!-- Dependencies from https://github.com/Microsoft/msbuild -->
126-
<MicrosoftBuildPackageVersion>17.8.32</MicrosoftBuildPackageVersion>
126+
<MicrosoftBuildPackageVersion>17.8.34</MicrosoftBuildPackageVersion>
127127
<MicrosoftBuildCurrentPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildCurrentPackageVersion>
128128
<!-- Some tasks and the resolver will need to run in an MSBuild that is older than the very latest,
129129
so target one that matches the version in minimumMSBuildVersion.
@@ -132,20 +132,20 @@
132132
<MicrosoftBuildPackageVersion Condition="exists('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion') and '$(DotNetBuildFromSource)' != 'true'">$([System.IO.File]::ReadAllText('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildPackageVersion>
133133
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
134134
<MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildRuntimePackageVersion>
135-
<MicrosoftBuildLocalizationPackageVersion>17.8.32-servicing-25352-05</MicrosoftBuildLocalizationPackageVersion>
135+
<MicrosoftBuildLocalizationPackageVersion>17.8.34-servicing-25404-06</MicrosoftBuildLocalizationPackageVersion>
136136
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
137137
<MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildTasksCorePackageVersion>
138138
<MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildTasksCorePackageVersion)</MicrosoftBuildTasksCoreVersion>
139139
</PropertyGroup>
140140
<PropertyGroup>
141141
<!-- Dependencies from https://github.com/dotnet/templating -->
142-
<MicrosoftTemplateEngineAbstractionsPackageVersion>8.0.119</MicrosoftTemplateEngineAbstractionsPackageVersion>
142+
<MicrosoftTemplateEngineAbstractionsPackageVersion>8.0.120</MicrosoftTemplateEngineAbstractionsPackageVersion>
143143
<MicrosoftTemplateEngineEdgePackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineEdgePackageVersion>
144144
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
145145
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
146146
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
147147
<!-- test dependencies -->
148-
<MicrosoftTemplateEngineMocksPackageVersion>8.0.119-servicing.25353.1</MicrosoftTemplateEngineMocksPackageVersion>
148+
<MicrosoftTemplateEngineMocksPackageVersion>8.0.120-servicing.25404.9</MicrosoftTemplateEngineMocksPackageVersion>
149149
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
150150
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
151151
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>

0 commit comments

Comments
 (0)