Merge branch 'feature/installer-merge-update-main' into feature/installer-merge-update
# Conflicts: # eng/Version.Details.xml # eng/Versions.props # global.json # src/redist/redist.csproj # src/redist/targets/BundledDotnetTools.targets # src/redist/targets/BundledTemplates.targets # src/redist/targets/Crossgen.targets # src/redist/targets/GenerateArchives.targets # src/redist/targets/GenerateLayout.targets # src/redist/targets/GeneratePKG.targets # test/SdkTests/SdkTests.csproj
This commit is contained in:
commit
34c7829222
121 changed files with 5521 additions and 4406 deletions
|
@ -79,8 +79,7 @@
|
|||
|
||||
<MSBuild Projects="$(MSBuildProjectFullPath)"
|
||||
Targets="InstallRuntimeToLayout"
|
||||
Properties="RuntimeVersionToInstall=%(RuntimeVersionToInstall.Identity)"
|
||||
BuildInParallel="false" />
|
||||
Properties="RuntimeVersionToInstall=%(RuntimeVersionToInstall.Identity)" />
|
||||
</Target>
|
||||
|
||||
<Target Name="InstallRuntimeToLayout">
|
||||
|
@ -149,7 +148,7 @@
|
|||
</TestProjectToRun>
|
||||
</ItemGroup>
|
||||
|
||||
<MSBuild Projects="@(TestProjectToRun)" Targets="RunTestsAsTool" BuildInParallel="true" />
|
||||
<MSBuild Projects="@(TestProjectToRun)" Targets="RunTestsAsTool" />
|
||||
</Target>
|
||||
|
||||
<Target Name="RunTestsAsTool">
|
||||
|
@ -202,6 +201,11 @@
|
|||
<TestArgs>$(TestArgs) -testList SdkIntegrationTests</TestArgs>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="$(StabilizePackageVersion) == 'true'">
|
||||
<!-- Add list of tests to skip in stable SDKS -->
|
||||
<TestArgs>$(TestArgs) -testConfigFile "$(MSBuildThisFileDirectory)TestsToSkipStableSDK.xml"</TestArgs>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="('$(OS)' == 'Windows_NT') And ('$(Architecture)' == 'x86')">
|
||||
<!-- Add list of tests to skip on x86 -->
|
||||
<TestArgs>$(TestArgs) -testConfigFile "$(MSBuildThisFileDirectory)TestsToSkipx86.xml"</TestArgs>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue