Skip to content

Commit

Permalink
Merge branch 'internal/release/7.0.4xx-10d' of https://dev.azure.com/…
Browse files Browse the repository at this point in the history
…dnceng/internal/_git/dotnet-sdk into internal/release/7.0.4xx-10d
  • Loading branch information
mmitche committed Oct 19, 2023
2 parents 20ba813 + d3c9f9b commit 96a7d38
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 9 deletions.
2 changes: 2 additions & 0 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<add key="darc-int-dotnet-runtime-3f73a2f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-3f73a2f1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-int-dotnet-templating-5c8951a" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-5c8951af/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-389f0c6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-389f0c69/nuget/v3/index.json" />
Expand All @@ -37,6 +38,7 @@
<disabledPackageSources>
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-int-dotnet-templating-5c8951a" value="true" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-e9fd676" value="true" />
Expand Down
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="7.0.301">
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="7.0.403">
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>1aba81f29698f89023e1c6e22d8dd225885be910</Sha>
<Sha>5c8951af9aaec2efb5a0b00eabe898e46dfb8a6b</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="7.0.301-rtm.23253.5">
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="7.0.403-servicing.true.23504.3">
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>1aba81f29698f89023e1c6e22d8dd225885be910</Sha>
<Sha>5c8951af9aaec2efb5a0b00eabe898e46dfb8a6b</Sha>
<SourceBuild RepoName="templating" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.13">
Expand Down Expand Up @@ -309,9 +309,9 @@
<Sha>740189d758fb3bbdc118c5b6171ef1a7351a8c44</Sha>
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.TestHelper" Version="7.0.301-rtm.23253.5">
<Dependency Name="Microsoft.TemplateEngine.TestHelper" Version="7.0.403-servicing.true.23504.3">
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>1aba81f29698f89023e1c6e22d8dd225885be910</Sha>
<Sha>5c8951af9aaec2efb5a0b00eabe898e46dfb8a6b</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
6 changes: 3 additions & 3 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -128,14 +128,14 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/templating -->
<MicrosoftTemplateEngineAbstractionsPackageVersion>7.0.301</MicrosoftTemplateEngineAbstractionsPackageVersion>
<MicrosoftTemplateEngineAbstractionsPackageVersion>7.0.403</MicrosoftTemplateEngineAbstractionsPackageVersion>
<MicrosoftTemplateEngineEdgePackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineEdgePackageVersion>
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
<!-- test dependencies -->
<MicrosoftTemplateEngineMocksPackageVersion>7.0.301-rtm.23253.5</MicrosoftTemplateEngineMocksPackageVersion>
<MicrosoftTemplateEngineTestHelperPackageVersion>7.0.301-rtm.23253.5</MicrosoftTemplateEngineTestHelperPackageVersion>
<MicrosoftTemplateEngineMocksPackageVersion>7.0.403-servicing.true.23504.3</MicrosoftTemplateEngineMocksPackageVersion>
<MicrosoftTemplateEngineTestHelperPackageVersion>7.0.403-servicing.true.23504.3</MicrosoftTemplateEngineTestHelperPackageVersion>
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
</PropertyGroup>
<PropertyGroup>
Expand Down

0 comments on commit 96a7d38

Please sign in to comment.