Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
ea2942c
Update dependencies from https://github.com/dotnet/source-build-refer…
dotnet-maestro[bot] Oct 16, 2025
03f3e6c
Merge branch 'release/8.0.4xx' into darc-release/8.0.4xx-ebafc10c-4c2…
SimonZhao888 Oct 17, 2025
14bafef
Merge branch 'release/8.0.4xx' into darc-release/8.0.4xx-ebafc10c-4c2…
SimonZhao888 Oct 21, 2025
7c65fe8
Update dependencies from https://github.com/dotnet/source-build-refer…
dotnet-maestro[bot] Oct 21, 2025
7f8ff0b
Update dependencies from https://github.com/dotnet/source-build-refer…
dotnet-maestro[bot] Oct 23, 2025
d3f327e
Merge branch 'release/8.0.4xx' into darc-release/8.0.4xx-ebafc10c-4c2…
DonnaChen888 Nov 6, 2025
fdda6c6
Merge branch 'release/8.0.4xx' into darc-release/8.0.4xx-ebafc10c-4c2…
DonnaChen888 Nov 10, 2025
977104f
Merge branch 'release/8.0.4xx' into darc-release/8.0.4xx-ebafc10c-4c2…
DonnaChen888 Nov 11, 2025
c82dd7d
Merge branch 'release/8.0.4xx' into darc-release/8.0.4xx-ebafc10c-4c2…
DonnaChen888 Nov 13, 2025
2547f43
[release/8.0.4xx] Update dependencies from dotnet/templating (#51407)
dotnet-maestro[bot] Nov 13, 2025
66b0a34
Merge branch 'release/8.0.4xx' into darc-release/8.0.4xx-ebafc10c-4c2…
DonnaChen888 Nov 14, 2025
2e2f319
[release/8.0.4xx] Update dependencies from dotnet/source-build-refere…
DonnaChen888 Nov 14, 2025
e676f11
Merge branch 'release/9.0.1xx' of https://github.com/dotnet/sdk into …
DonnaChen888 Nov 14, 2025
c084097
Merge branch 'release/9.0.1xx' into merge/release/8.0.4xx-to-release/…
DonnaChen888 Nov 17, 2025
5791984
Merge branch 'release/9.0.1xx' into merge/release/8.0.4xx-to-release/…
DonnaChen888 Nov 17, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'release/9.0.1xx' of https://github.com/dotnet/sdk into …
…merge/release/8.0.4xx-to-release/9.0.1xx
  • Loading branch information
DonnaChen888 committed Nov 14, 2025
commit e676f1188a83836cd6f40075939c6cfa849623a0
2 changes: 1 addition & 1 deletion NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<!-- Begin: Package sources from dotnet-runtime -->
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-pub-dotnet-templating-c3c91eb" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-c3c91ebe/nuget/v3/index.json" />
<add key="darc-pub-dotnet-templating-e784f3d" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-e784f3d6/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<!-- End: Package sources from dotnet-windowsdesktop -->
Expand Down
18 changes: 10 additions & 8 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.417">
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="9.0.113">
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>c3c91ebe67d2d7c002cabc03efd14a450b11979b</Sha>
<Sha>e784f3d6d4dc06ae806a254dd14b0979248aa83a</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.417-servicing.25559.2">
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="9.0.113-servicing.25562.8">
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>c3c91ebe67d2d7c002cabc03efd14a450b11979b</Sha>
<Sha>e784f3d6d4dc06ae806a254dd14b0979248aa83a</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.417-servicing.25559.2">
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="9.0.113-servicing.25562.8">
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>c3c91ebe67d2d7c002cabc03efd14a450b11979b</Sha>
<Sha>e784f3d6d4dc06ae806a254dd14b0979248aa83a</Sha>
<SourceBuild RepoName="templating" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.10">
Expand Down Expand Up @@ -449,9 +450,10 @@
<Sha>71dbdccd13f28cfd1a35649263b55ebbeab26ee7</Sha>
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25522.3">
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.25521.3">
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
<Sha>449148366d9105de8a6470ebc4ba198926e9a30a</Sha>
<Sha>a9cadb09ddcc99b1e535efb0648047634f0c4f40</Sha>
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="2.0.0-rtm.1.25059.4">
Expand Down
4 changes: 2 additions & 2 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -187,13 +187,13 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/templating -->
<MicrosoftTemplateEngineAbstractionsPackageVersion>8.0.417</MicrosoftTemplateEngineAbstractionsPackageVersion>
<MicrosoftTemplateEngineAbstractionsPackageVersion>9.0.113</MicrosoftTemplateEngineAbstractionsPackageVersion>
<MicrosoftTemplateEngineEdgePackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineEdgePackageVersion>
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
<!-- test dependencies -->
<MicrosoftTemplateEngineMocksPackageVersion>8.0.417-servicing.25559.2</MicrosoftTemplateEngineMocksPackageVersion>
<MicrosoftTemplateEngineMocksPackageVersion>9.0.113-servicing.25562.8</MicrosoftTemplateEngineMocksPackageVersion>
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.