Skip to content

Commit bdb0aba

Browse files
mmitchemmitche
committed
Merge remote-tracking branch 'upstream/release/5.0.1xx' into internal/release/5.0.1xx
2 parents ff6ab68 + ad59066 commit bdb0aba

File tree

3 files changed

+26
-30
lines changed

3 files changed

+26
-30
lines changed

‎NuGet.config‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
<!-- Begin: Package sources from dotnet-msbuild -->
1010
<add key="darc-pub-dotnet-msbuild-39993bd" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-msbuild-39993bd9/nuget/v3/index.json" />
1111
<!-- End: Package sources from dotnet-msbuild -->
12-
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
13-
<add key="darc-pub-dotnet-roslyn-analyzers-77b2593" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-roslyn-analyzers-77b25935/nuget/v3/index.json" />
14-
<!-- End: Package sources from dotnet-roslyn-analyzers -->
1512
<!-- Begin: Package sources from dotnet-runtime -->
1613
<add key="darc-int-dotnet-runtime-0260401" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-0260401c/nuget/v3/index.json" />
1714
<!-- End: Package sources from dotnet-runtime -->
15+
<!-- Begin: Package sources from dotnet-templating -->
16+
<add key="darc-pub-dotnet-templating-568c09b" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-568c09b9/nuget/v3/index.json" />
17+
<!-- End: Package sources from dotnet-templating -->
1818
<!-- Begin: Package sources from dotnet-windowsdesktop -->
1919
<add key="darc-int-dotnet-windowsdesktop-3fef65d" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-windowsdesktop-3fef65d2/nuget/v3/index.json" />
2020
<!-- End: Package sources from dotnet-windowsdesktop -->
@@ -29,10 +29,6 @@
2929
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
3030
</packageSources>
3131
<disabledPackageSources>
32-
<add key="darc-int-dotnet-runtime-728fdef" value="true" />
33-
<add key="darc-int-dotnet-aspnetcore-75759a8" value="true" />
34-
<add key="darc-int-dotnet-aspnetcore-489d2cc" value="true" />
35-
<add key="darc-int-dotnet-aspnetcore-4cf2feb" value="true" />
3632
<add key="darc-int-dotnet-windowsdesktop-3fef65d" value="true" />
3733
<add key="darc-int-dotnet-runtime-0260401" value="true" />
3834
<!-- Begin: Package sources from dotnet-aspnetcore -->

‎eng/Version.Details.xml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="5.0.1-servicing.20576.3">
4+
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="5.0.2-servicing.20611.2">
55
<Uri>https://github.com/dotnet/templating</Uri>
6-
<Sha>9d3065efbe93ec1daaa4d59115b2887f6b36766a</Sha>
6+
<Sha>568c09b99075179607c572f7b9f3ad3d706f1fc3</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="5.0.1">
8+
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="5.0.2">
99
<Uri>https://github.com/dotnet/templating</Uri>
10-
<Sha>9d3065efbe93ec1daaa4d59115b2887f6b36766a</Sha>
10+
<Sha>568c09b99075179607c572f7b9f3ad3d706f1fc3</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.TemplateEngine.Cli.Localization" Version="5.0.1-servicing.20576.3">
12+
<Dependency Name="Microsoft.TemplateEngine.Cli.Localization" Version="5.0.2-servicing.20611.2">
1313
<Uri>https://github.com/dotnet/templating</Uri>
14-
<Sha>9d3065efbe93ec1daaa4d59115b2887f6b36766a</Sha>
14+
<Sha>568c09b99075179607c572f7b9f3ad3d706f1fc3</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.TemplateEngine.Orchestrator.RunnableProjects" Version="5.0.1">
16+
<Dependency Name="Microsoft.TemplateEngine.Orchestrator.RunnableProjects" Version="5.0.2">
1717
<Uri>https://github.com/dotnet/templating</Uri>
18-
<Sha>9d3065efbe93ec1daaa4d59115b2887f6b36766a</Sha>
18+
<Sha>568c09b99075179607c572f7b9f3ad3d706f1fc3</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.TemplateEngine.Utils" Version="5.0.1">
20+
<Dependency Name="Microsoft.TemplateEngine.Utils" Version="5.0.2">
2121
<Uri>https://github.com/dotnet/templating</Uri>
22-
<Sha>9d3065efbe93ec1daaa4d59115b2887f6b36766a</Sha>
22+
<Sha>568c09b99075179607c572f7b9f3ad3d706f1fc3</Sha>
2323
</Dependency>
24-
<Dependency Name="Microsoft.TemplateSearch.Common" Version="5.0.1">
24+
<Dependency Name="Microsoft.TemplateSearch.Common" Version="5.0.2">
2525
<Uri>https://github.com/dotnet/templating</Uri>
26-
<Sha>9d3065efbe93ec1daaa4d59115b2887f6b36766a</Sha>
26+
<Sha>568c09b99075179607c572f7b9f3ad3d706f1fc3</Sha>
2727
</Dependency>
28-
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="5.0.1">
28+
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="5.0.2">
2929
<Uri>https://github.com/dotnet/templating</Uri>
30-
<Sha>9d3065efbe93ec1daaa4d59115b2887f6b36766a</Sha>
30+
<Sha>568c09b99075179607c572f7b9f3ad3d706f1fc3</Sha>
3131
</Dependency>
3232
<Dependency Name="Microsoft.NETCore.App.Ref" Version="5.0.0">
3333
<Uri>https://github.com/dotnet/runtime</Uri>
@@ -101,9 +101,9 @@
101101
<Uri>https://github.com/microsoft/vstest</Uri>
102102
<Sha>212656d7b384a506aa714999f678b3ace82d114e</Sha>
103103
</Dependency>
104-
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="5.0.0-rtm.20604.1">
104+
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="5.0.0-rtm.20612.1">
105105
<Uri>https://github.com/mono/linker</Uri>
106-
<Sha>0497f2ad6a13fe9c240a1a79bb07bd1fcbc73b9d</Sha>
106+
<Sha>25604250cf2663aed6630e305cc0538aeebda80a</Sha>
107107
</Dependency>
108108
<Dependency Name="System.CodeDom" Version="5.0.0">
109109
<Uri>https://github.com/dotnet/runtime</Uri>

‎eng/Versions.props‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
</PropertyGroup>
7070
<PropertyGroup>
7171
<!-- Dependencies from https://github.com/mono/linker -->
72-
<MicrosoftNETILLinkTasksPackageVersion>5.0.0-rtm.20604.1</MicrosoftNETILLinkTasksPackageVersion>
72+
<MicrosoftNETILLinkTasksPackageVersion>5.0.0-rtm.20612.1</MicrosoftNETILLinkTasksPackageVersion>
7373
</PropertyGroup>
7474
<PropertyGroup>
7575
<!-- Dependencies from https://github.com/dotnet/runtime -->
@@ -99,12 +99,12 @@
9999
</PropertyGroup>
100100
<PropertyGroup>
101101
<!-- Dependencies from https://github.com/dotnet/templating -->
102-
<MicrosoftTemplateEngineCliPackageVersion>5.0.1-servicing.20576.3</MicrosoftTemplateEngineCliPackageVersion>
103-
<MicrosoftTemplateEngineAbstractionsPackageVersion>5.0.1</MicrosoftTemplateEngineAbstractionsPackageVersion>
104-
<MicrosoftTemplateEngineCliLocalizationPackageVersion>5.0.1-servicing.20576.3</MicrosoftTemplateEngineCliLocalizationPackageVersion>
105-
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>5.0.1</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
106-
<MicrosoftTemplateEngineUtilsPackageVersion>5.0.1</MicrosoftTemplateEngineUtilsPackageVersion>
107-
<MicrosoftTemplateSearchCommonPackageVersion>5.0.1</MicrosoftTemplateSearchCommonPackageVersion>
102+
<MicrosoftTemplateEngineCliPackageVersion>5.0.2-servicing.20611.2</MicrosoftTemplateEngineCliPackageVersion>
103+
<MicrosoftTemplateEngineAbstractionsPackageVersion>5.0.2</MicrosoftTemplateEngineAbstractionsPackageVersion>
104+
<MicrosoftTemplateEngineCliLocalizationPackageVersion>5.0.2-servicing.20611.2</MicrosoftTemplateEngineCliLocalizationPackageVersion>
105+
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>5.0.2</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
106+
<MicrosoftTemplateEngineUtilsPackageVersion>5.0.2</MicrosoftTemplateEngineUtilsPackageVersion>
107+
<MicrosoftTemplateSearchCommonPackageVersion>5.0.2</MicrosoftTemplateSearchCommonPackageVersion>
108108
</PropertyGroup>
109109
<PropertyGroup>
110110
<!-- Dependencies from https://github.com/Microsoft/visualfsharp -->

0 commit comments

Comments
 (0)