Skip to content

[automated] Merge branch 'release/9.0.1xx' => 'release/9.0.2xx' #48921

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: release/9.0.2xx
Choose a base branch
from
Open

[automated] Merge branch 'release/9.0.1xx' => 'release/9.0.2xx' #48921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8147a93
Update dependencies from https://github.com/dotnet/test-templates bui…
dotnet-maestro[bot] May 12, 2025
86aa20c
[release/9.0.1xx] Update dependencies from dotnet/test-templates (#48…
nagilson May 12, 2025
60b9b3e
macOS Installer: Update relese notes link (#48722)
edvilme May 13, 2025
5c414b7
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] May 14, 2025
34f0096
[release/9.0.1xx] Update dependencies from dotnet/arcade (#48935)
v-wuzhai May 14, 2025
18c1d38
Merge branch 'release/9.0.2xx' of https://github.com/dotnet/sdk into …
v-wuzhai May 14, 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
2 changes: 1 addition & 1 deletion src/Installer/redist-installer/packaging/osx/resources/cs.lproj/conclusion.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ <h2 id="resources" style="padding-left:10px"> Prostředky </h2>
<ul>
<li><a id="dotnetdocumentation" href="https://aka.ms/dotnet-docs"> Dokumentace.NET</a></li>
<li><a id="sdkdocumentation" href="https://aka.ms/dotnet-cli-docs">Dokumentace SDK</a></li>
<li><a id="releasenotes" href="https://aka.ms/dotnet7-release-notes">Poznámky k verzi</a></li>
<li><a id="releasenotes" href="https://aka.ms/dotnet{DOTNETSDKVERSIONMAJOR}-release-notes">Poznámky k verzi</a></li>
<li><a id="tutorials" href="https://aka.ms/dotnet-tutorials">Tutorials</a></li>
</ul>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/Installer/redist-installer/packaging/osx/resources/de.lproj/conclusion.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ <h2 id="resources" style="padding-left:10px"> Ressourcen </h2>
<ul>
<li><a id="dotnetdocumentation" href="https://aka.ms/dotnet-docs">.NET-Dokumentation</a></li>
<li><a id="sdkdocumentation" href="https://aka.ms/dotnet-cli-docs">SDK-Dokumentation</a></li>
<li><a id="releasenotes" href="https://aka.ms/dotnet7-release-notes">Versionshinweise</a></li>
<li><a id="releasenotes" href="https://aka.ms/dotnet{DOTNETSDKVERSIONMAJOR}-release-notes">Versionshinweise</a></li>
<li><a id="tutorials" href="https://aka.ms/dotnet-tutorials">Tutorials</a></li>
</ul>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/Installer/redist-installer/packaging/osx/resources/en.lproj/conclusion.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ <h2 id="resources" style="padding-left:10px"> Resources </h2>
<ul>
<li><a id="dotnetdocumentation" href="https://aka.ms/dotnet-docs">.NET Documentation</a></li>
<li><a id="sdkdocumentation" href="https://aka.ms/dotnet-cli-docs">SDK Documentation</a></li>
<li><a id="releasenotes" href="https://aka.ms/dotnet7-release-notes">Release Notes</a></li>
<li><a id="releasenotes" href="https://aka.ms/dotnet{DOTNETSDKVERSIONMAJOR}-release-notes">Release Notes</a></li>
<li><a id="tutorials" href="https://aka.ms/dotnet-tutorials">Tutorials</a></li>
</ul>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/Installer/redist-installer/packaging/osx/resources/es.lproj/conclusion.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ <h2 id="resources" style="padding-left:10px"> Recursos </h2>
<ul>
<li><a id="dotnetdocumentation" href="https://aka.ms/dotnet-docs">Documentación de .NET</a></li>
<li><a id="sdkdocumentation" href="https://aka.ms/dotnet-cli-docs">Documentación de SDK</a></li>
<li><a id="releasenotes" href="https://aka.ms/dotnet7-release-notes">Notas de la versión</a></li>
<li><a id="releasenotes" href="https://aka.ms/dotnet{DOTNETSDKVERSIONMAJOR}-release-notes">Notas de la versión</a></li>
<li><a id="tutorials" href="https://aka.ms/dotnet-tutorials">Tutoriales</a></li>
</ul>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/Installer/redist-installer/packaging/osx/resources/fr.lproj/conclusion.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ <h2 id="resources" style="padding-left:10px"> Ressources </h2>
<ul>
<li><a id="dotnetdocumentation" href="https://aka.ms/dotnet-docs">Documentation .NET</a></li>
<li><a id="sdkdocumentation" href="https://aka.ms/dotnet-cli-docs">Kit de développement logiciel (SDK) de documentation</a></li>
<li><a id="releasenotes" href="https://aka.ms/dotnet7-release-notes">Notes de publication</a></li>
<li><a id="releasenotes" href="https://aka.ms/dotnet{DOTNETSDKVERSIONMAJOR}-release-notes">Notes de publication</a></li>
<li><a id="tutorials" href="https://aka.ms/dotnet-tutorials">Tutoriels</a></li>
</ul>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/Installer/redist-installer/packaging/osx/resources/it.lproj/conclusion.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ <h2 id="resources" style="padding-left:10px"> Risorse </h2>
<ul>
<li><a id="dotnetdocumentation" href="https://aka.ms/dotnet-docs">Documentazione .NET</a></li>
<li><a id="sdkdocumentation" href="https://aka.ms/dotnet-cli-docs">documentazione SDK</a></li>
<li><a id="releasenotes" href="https://aka.ms/dotnet7-release-notes">Note sulla versione</a></li>
<li><a id="releasenotes" href="https://aka.ms/dotnet{DOTNETSDKVERSIONMAJOR}-release-notes">Note sulla versione</a></li>
<li><a id="tutorials" href="https://aka.ms/dotnet-tutorials">Esercitazioni</a></li>
</ul>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/Installer/redist-installer/packaging/osx/resources/ja.lproj/conclusion.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ <h2 id="resources" style="padding-left:10px"> リソース </h2>
<ul>
<li><a id="dotnetdocumentation" href="https://aka.ms/dotnet-docs">.NET ドキュメント</a></li>
<li><a id="sdkdocumentation" href="https://aka.ms/dotnet-cli-docs">SDK ドキュメント</a></li>
<li><a id="releasenotes" href="https://aka.ms/dotnet7-release-notes">リリース ノート</a></li>
<li><a id="releasenotes" href="https://aka.ms/dotnet{DOTNETSDKVERSIONMAJOR}-release-notes">リリース ノート</a></li>
<li><a id="tutorials" href="https://aka.ms/dotnet-tutorials">チュートリアル</a></li>
</ul>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/Installer/redist-installer/packaging/osx/resources/ko.lproj/conclusion.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ <h2 id="resources" style="padding-left:10px"> 리소스 </h2>
<ul>
<li><a id="dotnetdocumentation" href="https://aka.ms/dotnet-docs">.NET 설명서</a></li>
<li><a id="sdkdocumentation" href="https://aka.ms/dotnet-cli-docs">SDK 설명서</a></li>
<li><a id="releasenotes" href="https://aka.ms/dotnet7-release-notes">릴리스 정보</a></li>
<li><a id="releasenotes" href="https://aka.ms/dotnet{DOTNETSDKVERSIONMAJOR}-release-notes">릴리스 정보</a></li>
<li><a id="tutorials" href="https://aka.ms/dotnet-tutorials">자습서</a></li>
</ul>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/Installer/redist-installer/packaging/osx/resources/pl.lproj/conclusion.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ <h2 id="resources" style="padding-left:10px"> Zasoby </h2>
<ul>
<li><a id="dotnetdocumentation" href="https://aka.ms/dotnet-docs">Dokumentacja platformy .NET</a></li>
<li><a id="sdkdocumentation" href="https://aka.ms/dotnet-cli-docs">Dokumentacja zestawu SDK</a></li>
<li><a id="releasenotes" href="https://aka.ms/dotnet7-release-notes">Informacje o wersji</a></li>
<li><a id="releasenotes" href="https://aka.ms/dotnet{DOTNETSDKVERSIONMAJOR}-release-notes">Informacje o wersji</a></li>
<li><a id="tutorials" href="https://aka.ms/dotnet-tutorials">Samouczki</a></li>
</ul>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/Installer/redist-installer/packaging/osx/resources/pt-br.lproj/conclusion.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ <h2 id="resources" style="padding-left:10px"> Recursos </h2>
<ul>
<li><a id="dotnetdocumentation" href="https://aka.ms/dotnet-docs">Documentação do .NET</a></li>
<li><a id="sdkdocumentation" href="https://aka.ms/dotnet-cli-docs">Documentação do SDK</a></li>
<li><a id="releasenotes" href="https://aka.ms/dotnet7-release-notes">Notas sobre a versão</a></li>
<li><a id="releasenotes" href="https://aka.ms/dotnet{DOTNETSDKVERSIONMAJOR}-release-notes">Notas sobre a versão</a></li>
<li><a id="tutorials" href="https://aka.ms/dotnet-tutorials">Tutoriais</a></li>
</ul>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/Installer/redist-installer/packaging/osx/resources/ru.lproj/conclusion.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ <h2 id="resources" style="padding-left:10px"> Ресурсы </h2>
<ul>
<li><a id="dotnetdocumentation" href="https://aka.ms/dotnet-docs">Документация по .NET</a></li>
<li><a id="sdkdocumentation" href="https://aka.ms/dotnet-cli-docs">Документация по SDK</a></li>
<li><a id="releasenotes" href="https://aka.ms/dotnet7-release-notes">Заметки о выпуске</a></li>
<li><a id="releasenotes" href="https://aka.ms/dotnet{DOTNETSDKVERSIONMAJOR}-release-notes">Заметки о выпуске</a></li>
<li><a id="tutorials" href="https://aka.ms/dotnet-tutorials">Руководства</a></li>
</ul>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/Installer/redist-installer/packaging/osx/resources/tr.lproj/conclusion.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ <h2 id="resources" style="padding-left:10px"> Kaynaklar </h2>
<ul>
<li><a id="dotnetdocumentation" href="https://aka.ms/dotnet-docs">.NET Documentation</a></li>
<li><a id="sdkdocumentation" href="https://aka.ms/dotnet-cli-docs">SDK Documentation</a></li>
<li><a id="releasenotes" href="https://aka.ms/dotnet7-release-notes">Release Notes</a></li>
<li><a id="releasenotes" href="https://aka.ms/dotnet{DOTNETSDKVERSIONMAJOR}-release-notes">Release Notes</a></li>
<li><a id="tutorials" href="https://aka.ms/dotnet-tutorials">Tutorials</a></li>
</ul>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/Installer/redist-installer/packaging/osx/resources/zh-hans.lproj/conclusion.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ <h2 id="resources" style="padding-left:10px"> 资源 </h2>
<ul>
<li><a id="dotnetdocumentation" href="https://aka.ms/dotnet-docs">.NET 文档</a></li>
<li><a id="sdkdocumentation" href="https://aka.ms/dotnet-cli-docs">SDK 文档</a></li>
<li><a id="releasenotes" href="https://aka.ms/dotnet7-release-notes">发行说明</a></li>
<li><a id="releasenotes" href="https://aka.ms/dotnet{DOTNETSDKVERSIONMAJOR}-release-notes">发行说明</a></li>
<li><a id="tutorials" href="https://aka.ms/dotnet-tutorials">教程</a></li>
</ul>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/Installer/redist-installer/packaging/osx/resources/zh-hant.lproj/conclusion.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ <h2 id="resources" style="padding-left:10px"> 資源 </h2>
<ul>
<li><a id="dotnetdocumentation" href="https://aka.ms/dotnet-docs">.NET 文件</a></li>
<li><a id="sdkdocumentation" href="https://aka.ms/dotnet-cli-docs">SDK 文件</a></li>
<li><a id="releasenotes" href="https://aka.ms/dotnet7-release-notes">版本資訊</a></li>
<li><a id="releasenotes" href="https://aka.ms/dotnet{DOTNETSDKVERSIONMAJOR}-release-notes">版本資訊</a></li>
<li><a id="tutorials" href="https://aka.ms/dotnet-tutorials">教學課程</a></li>
</ul>
</div>
Expand Down
3 changes: 3 additions & 0 deletions src/Installer/redist-installer/targets/GeneratePKG.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,9 @@
<ResourcesReplacement Include="{DOTNETSDKVERSION}">
<ReplacementString>$(Version)</ReplacementString>
</ResourcesReplacement>
<ResourcesReplacement Include="{DOTNETSDKVERSIONMAJOR}">
<ReplacementString>$(VersionMajor)</ReplacementString>
</ResourcesReplacement>
<ResourcesReplacement Include="{DOTNETRUNTIMEVERSION}">
<ReplacementString>$(MicrosoftNETCoreAppRuntimePackageVersion)</ReplacementString>
</ResourcesReplacement>
Expand Down