Skip to content

Commit 4dbd7ab

Browse files
dotnet-botdotnet-bot
committed
Merge in 'release/6.0' changes
2 parents ea8d8f1 + 754ada3 commit 4dbd7ab

File tree

23 files changed

+178
-129
lines changed

23 files changed

+178
-129
lines changed

‎.azure/pipelines/helix-matrix.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@ schedules:
1111
- cron: "0 9 * * *"
1212
branches:
1313
include:
14-
- release/5.0
1514
- release/6.0
16-
always: false
1715

1816
variables:
1917
- ${{ if ne(variables['System.TeamProject'], 'internal') }}:

‎docs/BuildFromSource.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,9 @@ Visual Studio 2019 (16.10 Preview 3) is required to build the repo locally. If y
8888
> You can do so by running the `Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser` command
8989
> in PowerShell. For more information on execution policies, you can read the [execution policy docs](https://docs.microsoft.com/powershell/module/microsoft.powershell.security/set-executionpolicy).
9090
91-
The [global.json](/global.json) file specifies the minimum requirements needed to build using `msbuild`. The [eng/scripts/vs.json](/eng/scripts/vs.json) file provides a description of the components needed to build within VS. If you plan on developing in Visual Studio, you will need to have these components installed.
91+
The [global.json](/global.json) file specifies the minimum requirements needed to build using `msbuild`. The [eng/scripts/vs.16.json](/eng/scripts/vs.16.json) file provides a description of the components needed to build within VS. If you plan on developing in Visual Studio, you will need to have these components installed.
9292

93-
> :bulb: The `InstallVisualStudio.ps1` script mentioned above reads from the `vs.json` file to determine what components to install.
93+
> :bulb: The `InstallVisualStudio.ps1` script mentioned above reads from the `vs.16.json` file to determine what components to install.
9494
9595
#### [Git](https://git-scm.org) on Windows
9696

@@ -284,7 +284,7 @@ To build a code change associated with a modification, run the build script in t
284284
On Windows, you can run the command script:
285285

286286
```powershell
287-
.\build.cmd
287+
.\eng\build.cmd
288288
```
289289

290290
On macOS/Linux, you can run the shell script:
@@ -293,7 +293,7 @@ On macOS/Linux, you can run the shell script:
293293
./build.sh
294294
```
295295

296-
> :bulb: Before using the `build.cmd` or `build.sh` at the top-level or in a subfolder, you will need to make sure that [the dependencies documented above](#step-2-install-pre-requisites) have been installed.
296+
> :bulb: Before using the `.\eng\build.cmd` or `.\eng\build.sh` at the top-level or in a subfolder, you will need to make sure that [the dependencies documented above](#step-2-install-pre-requisites) have been installed.
297297
298298
By default, all of the C# projects are built. Some C# projects require NodeJS to be installed to compile JavaScript assets which are then checked in as source. If NodeJS is detected on the path, the NodeJS projects will be compiled as part of building C# projects. If NodeJS is not detected on the path, the JavaScript assets checked in previously will be used instead. To disable building NodeJS projects, specify `-noBuildNodeJS` or `--no-build-nodejs` on the command line.
299299

@@ -369,9 +369,9 @@ See ["Artifacts"](./Artifacts.md) for more explanation of the different folders
369369
Building installers does not run as part of `build.cmd` run without parameters, so you should opt-in for building them:
370370

371371
```powershell
372-
.\build.cmd -all -pack -arch x64
373-
.\build.cmd -all -pack -arch x86 -noBuildJava
374-
.\build.cmd -buildInstallers
372+
.\eng\build.cmd -all -pack -arch x64
373+
.\eng\build.cmd -all -pack -arch x86 -noBuildJava
374+
.\eng\build.cmd -buildInstallers
375375
```
376376

377377
_Note_: Additional build steps listed above aren't necessary on Linux or macOS.

‎eng/scripts/InstallVisualStudio.ps1

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ if ("$Version" -eq "2019") {
7070
}
7171
if ("$Version" -eq "2022") {
7272
$vsversion = 17;
73-
$Channel = "Preview";
7473
}
7574
$channelUri = "https://aka.ms/vs/$vsversion/release"
7675
$responseFileName = "vs.$vsversion"

‎eng/scripts/vs.17.buildtools.json

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{
2+
"channelUri": "https://aka.ms/vs/17/release/channel",
3+
"channelId": "VisualStudio.17.Release",
4+
"includeRecommended": false,
5+
"addProductLang": [
6+
"en-US"
7+
],
8+
"add": [
9+
"Microsoft.Net.Component.4.6.2.TargetingPack",
10+
"Microsoft.Net.Component.4.7.2.SDK",
11+
"Microsoft.Net.Component.4.7.2.TargetingPack",
12+
"Microsoft.VisualStudio.Component.FSharp.MSBuild",
13+
"Microsoft.VisualStudio.Component.NuGet",
14+
"Microsoft.VisualStudio.Component.NuGet.BuildTools",
15+
"Microsoft.VisualStudio.Component.VC.ATL",
16+
"Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
17+
"Microsoft.VisualStudio.Component.Windows10SDK.18362",
18+
"Microsoft.VisualStudio.Workload.ManagedDesktopBuildTools",
19+
"Microsoft.VisualStudio.Workload.MSBuildTools",
20+
"Microsoft.VisualStudio.Workload.NetCoreBuildTools",
21+
"Microsoft.VisualStudio.Workload.VCTools",
22+
"Microsoft.VisualStudio.Workload.VisualStudioExtensionBuildTools",
23+
"Microsoft.VisualStudio.Workload.WebBuildTools"
24+
]
25+
}

‎eng/scripts/vs.17.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"channelUri": "https://aka.ms/vs/17/release/channel",
3+
"channelId": "VisualStudio.17.Release",
4+
"includeRecommended": false,
5+
"addProductLang": [
6+
"en-US"
7+
],
8+
"add": [
9+
"Microsoft.Net.Component.4.6.2.TargetingPack",
10+
"Microsoft.Net.Component.4.7.2.SDK",
11+
"Microsoft.Net.Component.4.7.2.TargetingPack",
12+
"Microsoft.VisualStudio.Component.VC.ATL",
13+
"Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
14+
"Microsoft.VisualStudio.Component.Windows10SDK.18362",
15+
"Microsoft.VisualStudio.Workload.ManagedDesktop",
16+
"Microsoft.VisualStudio.Workload.NativeDesktop",
17+
"Microsoft.VisualStudio.Workload.NetWeb",
18+
"Microsoft.VisualStudio.Workload.VisualStudioExtension"
19+
]
20+
}

‎eng/targets/Helix.Common.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<HelixQueueDebian11>(Debian.11.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-11-helix-amd64</HelixQueueDebian11>
66
<HelixQueueFedora34>(Fedora.34.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:fedora-34-helix</HelixQueueFedora34>
77
<HelixQueueMariner>(Mariner)[email protected]/dotnet-buildtools/prereqs:cbl-mariner-1.0-helix</HelixQueueMariner>
8-
<HelixQueueArmDebian11>(Debian.11.Arm64.Open)Ubuntu.1804.Armarch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-arm64v8</HelixQueueArmDebian11>
8+
<HelixQueueArmDebian11>(Debian.11.Arm64.Open)ubuntu.2004.armarch.open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-arm64v8</HelixQueueArmDebian11>
99
</PropertyGroup>
1010

1111
<ItemGroup Condition="'$(IsWindowsOnlyTest)' != 'true'">
@@ -58,13 +58,13 @@
5858

5959
<!-- IIS Express isn't supported on arm64 and most of the IsWindowsOnlyTests depend on it's setup scripts. -->
6060
<ItemGroup Condition="'$(TargetArchitecture)' == 'arm64' AND '$(IsHelixDaily)' == 'true' AND '$(_UseHelixOpenQueues)' == 'true' AND '$(IsWindowsOnlyTest)' != 'true'">
61-
<HelixAvailableTargetQueue Include="Windows.10.Arm64v8.Open" Platform="Windows" />
61+
<HelixAvailableTargetQueue Include="windows.11.arm64.open" Platform="Windows" />
6262
</ItemGroup>
6363

6464
<PropertyGroup>
6565
<IsWindowsHelixQueue>false</IsWindowsHelixQueue>
66-
<IsWindowsHelixQueue Condition="$(HelixTargetQueue.Contains('Windows')) or $(HelixTargetQueue.Contains('windows'))">true</IsWindowsHelixQueue>
66+
<IsWindowsHelixQueue Condition="$(HelixTargetQueue.ToUpperInvariant().Contains('WINDOWS'))">true</IsWindowsHelixQueue>
6767
<IsMacHelixQueue>false</IsMacHelixQueue>
68-
<IsMacHelixQueue Condition="$(HelixTargetQueue.Contains('OSX')) or $(HelixTargetQueue.Contains('macOs'))">true</IsMacHelixQueue>
68+
<IsMacHelixQueue Condition="$(HelixTargetQueue.ToUpperInvariant().Contains('OSX'))">true</IsMacHelixQueue>
6969
</PropertyGroup>
7070
</Project>

‎src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -225,11 +225,22 @@ This package is an internal implementation of the .NET Core SDK and is not meant
225225
<!-- This project doesn't compile anything. -->
226226
<Target Name="CoreCompile" />
227227

228-
<Target Name="FilterUnwantedContent">
228+
<Target Name="FilterUnwantedContent"
229+
DependsOnTargets="_ExpandRuntimePackageRoot">
229230
<ItemGroup>
230231
<!-- These files end up in this item group as a result of setting CopyLocalLockFileAssemblies, but shouldn't be. -->
231232
<ReferenceCopyLocalPaths Remove="@(ReferenceCopyLocalPaths)" Condition="'%(FileName)' == 'apphost' OR '%(FileName)' == '$(LibPrefix)hostfxr' OR '%(FileName)' == '$(LibPrefix)hostpolicy' "/>
232233
</ItemGroup>
234+
235+
<ItemGroup>
236+
<RuntimePackageFiles Include="$(RuntimePackageRoot)runtimes\**\*" />
237+
<!--
238+
Filter out any overlap between our SharedFx (ReferenceCopyLocalPaths) and dotnet/runtime's SharedFx (RuntimePackageFiles).
239+
Most of the time there is no overlap, but in certain rare corner cases there can be.
240+
See https://github.com/dotnet/aspnetcore/issues/45033 for more detail.
241+
-->
242+
<ReferenceCopyLocalPaths Remove="@(RuntimePackageFiles)" MatchOnMetadata="FileName"/>
243+
</ItemGroup>
233244
</Target>
234245

235246
<Target Name="_WarnAboutUnbuiltNativeDependencies"
@@ -369,7 +380,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant
369380

370381
<Target Name="PrepareForCrossGen"
371382
Condition="'$(CrossgenOutput)' == 'true'"
372-
DependsOnTargets="_ExpandRuntimePackageRoot">
383+
DependsOnTargets="FilterUnwantedContent">
373384
<!-- The output directories of assemblies built in this repo contain a mix of ref and impl assemblies. Copy impl assemblies to a separate directory. -->
374385
<RemoveDir Directories="$(CrossgenPlatformAssembliesDir)" />
375386
<Copy SourceFiles="@(ReferenceCopyLocalPaths)" DestinationFolder="$(CrossgenPlatformAssembliesDir)" Condition="'%(ReferenceCopyLocalPaths.ProjectPath)' != ''"/>
@@ -410,10 +421,6 @@ This package is an internal implementation of the .NET Core SDK and is not meant
410421
File="$(CrossgenToolDir)PlatformAssembliesPathsCrossgen2.rsp"
411422
Overwrite="true" />
412423

413-
<ItemGroup>
414-
<RuntimePackageFiles Include="$(RuntimePackageRoot)runtimes\**\*" />
415-
</ItemGroup>
416-
417424
<Error Text="Could not find crossgen2 $(CrossgenToolPath)" Condition=" ! Exists($(CrossgenToolPath))" />
418425

419426
<!-- Create tool directory with runtime assemblies -->

‎src/Installers/Windows/WindowsHostingBundle/1028/thm.wxl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,16 @@
3838
<String Id="ModifyCloseButton">關閉(&amp;C)</String>
3939
<String Id="SuccessRepairHeader">修復已成功完成</String>
4040
<String Id="SuccessUninstallHeader">解除安裝已成功完成</String>
41-
<String Id="SuccessInstallHeader">安裝已成功完成</String>
42-
<String Id="SuccessHeader">設定成功</String>
41+
<String Id="SuccessInstallHeader">安裝已成功完成</String>
42+
<String Id="SuccessHeader">設定成功</String>
4343
<String Id="SuccessLaunchButton">啟動(&amp;L)</String>
4444
<String Id="SuccessRestartText">必須重新啟動電腦，才能使用此軟體。</String>
4545
<String Id="SuccessRestartButton">重新啟動(&amp;R)</String>
4646
<String Id="SuccessCloseButton">關閉(&amp;C)</String>
4747
<String Id="FailureHeader">設定失敗</String>
4848
<String Id="FailureInstallHeader">安裝程式失敗</String>
4949
<String Id="FailureUninstallHeader">解除安裝失敗</String>
50-
<String Id="FailureRepairHeader">修復失敗</String>
50+
<String Id="FailureRepairHeader">修復失敗</String>
5151
<String Id="FailureHyperlinkLogText">有一個或多個問題導致安裝程式失敗。請解決問題，然後重試一次安裝。如需詳細資訊，請參閱&lt;a href="#"&gt;記錄檔&lt;/a&gt;。</String>
5252
<String Id="FailureRestartText">必須重新啟動電腦，才能完成軟體的復原。</String>
5353
<String Id="FailureRestartButton">重新啟動(&amp;R)</String>
@@ -61,9 +61,9 @@
6161

6262
<!-- Custom UI strings -->
6363
<String Id="Welcome">歡迎使用 [WixBundleName] 安裝程式。</String>
64-
<String Id="InstallResetIIS">請在安裝完成後重新啟動 IIS。如需其他資訊，請參閱&lt;a href="https://go.microsoft.com/fwlink/?LinkId=798277"&gt;這裡&lt;/a&gt;。</String>
65-
<String Id="InstallNoIIS">這部電腦上未啟用 IIS。如果您要使用 IIS 執行 ASP.NET Core 應用程式，就必須先安裝 IIS 才能執行此安裝程式。如需其他資訊，請參閱&lt;a href="https://go.microsoft.com/fwlink/?LinkId=798277"&gt;這裡&lt;/a&gt;。</String>
64+
<String Id="InstallResetIIS">請在安裝完成後重新啟動 IIS。如需其他資訊，請參閱&lt;a href="https://aka.ms/aspnet/6.0/host-and-deploy-with-iis"&gt;這裡&lt;/a&gt;。</String>
65+
<String Id="InstallNoIIS">這部電腦上未啟用 IIS。如果您要使用 IIS 執行 ASP.NET Core 應用程式，就必須先安裝 IIS 才能執行此安裝程式。如需其他資訊，請參閱&lt;a href="https://aka.ms/aspnet/6.0/host-and-deploy-with-iis"&gt;這裡&lt;/a&gt;。</String>
6666
<String Id="EulaPrivacy">[WixBundleName] &lt;a href="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;授權條款&lt;/a&gt;和&lt;a href="https://go.microsoft.com/fwlink/?LinkId=786378"&gt;隱私權聲明&lt;/a&gt;。</String>
67-
<String Id="ModifyResetIIS">請在安裝完成後重新啟動 IIS。如需其他資訊，請參閱&lt;a href="https://go.microsoft.com/fwlink/?LinkId=798277"&gt;這裡&lt;/a&gt;。</String>
68-
<String Id="ModifyNoIIS">這部電腦上未啟用 IIS。如果您要使用 IIS 執行 ASP.NET Core 應用程式，就必須先安裝 IIS 才能執行此安裝程式。如需其他資訊，請參閱&lt;a href="https://go.microsoft.com/fwlink/?LinkId=798277"&gt;這裡&lt;/a&gt;。</String>
67+
<String Id="ModifyResetIIS">請在安裝完成後重新啟動 IIS。如需其他資訊，請參閱&lt;a href="https://aka.ms/aspnet/6.0/host-and-deploy-with-iis"&gt;這裡&lt;/a&gt;。</String>
68+
<String Id="ModifyNoIIS">這部電腦上未啟用 IIS。如果您要使用 IIS 執行 ASP.NET Core 應用程式，就必須先安裝 IIS 才能執行此安裝程式。如需其他資訊，請參閱&lt;a href="https://aka.ms/aspnet/6.0/host-and-deploy-with-iis"&gt;這裡&lt;/a&gt;。</String>
6969
</WixLocalization>

‎src/Installers/Windows/WindowsHostingBundle/1029/thm.wxl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,16 @@
3838
<String Id="ModifyCloseButton">&amp;Zavřít</String>
3939
<String Id="SuccessRepairHeader">Oprava se úspěšně dokončila.</String>
4040
<String Id="SuccessUninstallHeader">Odinstalace se úspěšně dokončila.</String>
41-
<String Id="SuccessInstallHeader">Instalace se úspěšně dokončila.</String>
42-
<String Id="SuccessHeader">Instalace byla úspěšná.</String>
41+
<String Id="SuccessInstallHeader">Instalace se úspěšně dokončila.</String>
42+
<String Id="SuccessHeader">Instalace byla úspěšná.</String>
4343
<String Id="SuccessLaunchButton">&amp;Spustit</String>
4444
<String Id="SuccessRestartText">Před použitím tohoto softwaru musíte restartovat počítač.</String>
4545
<String Id="SuccessRestartButton">&amp;Restartovat</String>
4646
<String Id="SuccessCloseButton">&amp;Zavřít</String>
4747
<String Id="FailureHeader">Instalace se nepovedla.</String>
4848
<String Id="FailureInstallHeader">Instalace se nepovedla.</String>
4949
<String Id="FailureUninstallHeader">Odinstalace se nepovedla.</String>
50-
<String Id="FailureRepairHeader">Oprava se nepovedla.</String>
50+
<String Id="FailureRepairHeader">Oprava se nepovedla.</String>
5151
<String Id="FailureHyperlinkLogText">Instalace se nepovedla kvůli jednomu nebo více problémům. Opravte prosím tyto problémy a zkuste software nainstalovat znovu. Další informace najdete v &lt;a href="#"&gt;souboru protokolu&lt;/a&gt;.</String>
5252
<String Id="FailureRestartText">Pro dokončení vrácení změn tohoto softwaru je potřeba restartovat počítač.</String>
5353
<String Id="FailureRestartButton">&amp;Restartovat</String>
@@ -61,9 +61,9 @@
6161

6262
<!-- Custom UI strings -->
6363
<String Id="Welcome">Vítá vás instalační program produktu [WixBundleName]</String>
64-
<String Id="InstallResetIIS">Po dokončení instalace prosím restartujte službu IIS. Další informace najdete &lt;a href="https://go.microsoft.com/fwlink/?LinkId=798277"&gt;tady&lt;/a&gt;.</String>
65-
<String Id="InstallNoIIS">Služba IIS není na tomto počítači povolená. Pokud máte v úmyslu spouštět aplikace ASP.NET Core se službou IIS, je nutné před spuštěním tohoto instalačního programu nainstalovat službu IIS. Další informace najdete &lt;a href="https://go.microsoft.com/fwlink/?LinkId=798277"&gt;tady&lt;/a&gt;.</String>
64+
<String Id="InstallResetIIS">Po dokončení instalace prosím restartujte službu IIS. Další informace najdete &lt;a href="https://aka.ms/aspnet/6.0/host-and-deploy-with-iis"&gt;tady&lt;/a&gt;.</String>
65+
<String Id="InstallNoIIS">Služba IIS není na tomto počítači povolená. Pokud máte v úmyslu spouštět aplikace ASP.NET Core se službou IIS, je nutné před spuštěním tohoto instalačního programu nainstalovat službu IIS. Další informace najdete &lt;a href="https://aka.ms/aspnet/6.0/host-and-deploy-with-iis"&gt;tady&lt;/a&gt;.</String>
6666
<String Id="EulaPrivacy">[WixBundleName] – &lt;a href="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;licenční podmínky&lt;/a&gt; a &lt;a href="https://go.microsoft.com/fwlink/?LinkId=786378"&gt;prohlášení o zásadách ochrany osobních údajů&lt;/a&gt;</String>
67-
<String Id="ModifyResetIIS">Po dokončení instalace prosím restartujte službu IIS. Další informace najdete &lt;a href="https://go.microsoft.com/fwlink/?LinkId=798277"&gt;tady&lt;/a&gt;.</String>
68-
<String Id="ModifyNoIIS">Služba IIS není na tomto počítači povolená. Pokud máte v úmyslu spouštět aplikace ASP.NET Core se službou IIS, je nutné před spuštěním tohoto instalačního programu nainstalovat službu IIS. Další informace najdete &lt;a href="https://go.microsoft.com/fwlink/?LinkId=798277"&gt;tady&lt;/a&gt;.</String>
67+
<String Id="ModifyResetIIS">Po dokončení instalace prosím restartujte službu IIS. Další informace najdete &lt;a href="https://aka.ms/aspnet/6.0/host-and-deploy-with-iis"&gt;tady&lt;/a&gt;.</String>
68+
<String Id="ModifyNoIIS">Služba IIS není na tomto počítači povolená. Pokud máte v úmyslu spouštět aplikace ASP.NET Core se službou IIS, je nutné před spuštěním tohoto instalačního programu nainstalovat službu IIS. Další informace najdete &lt;a href="https://aka.ms/aspnet/6.0/host-and-deploy-with-iis"&gt;tady&lt;/a&gt;.</String>
6969
</WixLocalization>

0 commit comments

Comments
 (0)