diff options
author | Carlos Sanchez <1175054+carlossanlop@users.noreply.github.com> | 2022-08-23 20:35:28 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-08-23 20:35:28 +0300 |
commit | abc9acdd6d4f0b6a0abda55bb20b50190306bce0 (patch) | |
tree | 51ed6006e15a82dbc27d1447f07d4d186c3222ae /eng | |
parent | ef077d0b58ffddcf54fa73bd85dace6b999b8992 (diff) | |
parent | 0bc5fa888a77e00329061f2cb4e2aa190bd1944d (diff) |
Merge pull request #74350 from dotnet-maestro-bot/merge/release/7.0-rc1-to-release/7.0
[automated] Merge branch 'release/7.0-rc1' => 'release/7.0'
Diffstat (limited to 'eng')
-rw-r--r-- | eng/Version.Details.xml | 16 | ||||
-rw-r--r-- | eng/Versions.props | 8 | ||||
-rw-r--r-- | eng/pipelines/coreclr/perf-wasm-prepare-artifacts-steps.yml | 2 | ||||
-rw-r--r-- | eng/pipelines/coreclr/templates/perf-job.yml | 2 | ||||
-rw-r--r-- | eng/pipelines/coreclr/templates/run-scenarios-job.yml | 2 | ||||
-rw-r--r-- | eng/testing/tests.wasm.targets | 22 | ||||
-rw-r--r-- | eng/testing/workloads-testing.targets | 90 |
7 files changed, 63 insertions, 79 deletions
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bf5e0bcf436..7cf722a6ef3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,13 @@ <Dependencies> <ProductDependencies> - <Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="7.0.0-rc.1.22408.1"> + <Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="7.0.0-rc.1.22419.2"> <Uri>https://github.com/dotnet/icu</Uri> - <Sha>c04d1340510269c5cd07a285abb097f587924d5b</Sha> + <Sha>e269add83f4fe1b4ce3b7fbce0575728239f801b</Sha> </Dependency> <Dependency Name="System.Net.MsQuic.Transport" Version="7.0.0-alpha.1.22406.1"> <Uri>https://github.com/dotnet/msquic</Uri> <Sha>dc012a715ceb9b5d5258f2fda77520586af5a36a</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-7.0.100" Version="7.0.0-rc.1.22411.1"> - <Uri>https://github.com/dotnet/emsdk</Uri> - <Sha>216093204c415b6e37dfadfcbcf183881b443636</Sha> - </Dependency> <Dependency Name="System.ServiceModel.Primitives" Version="4.9.0-rc2.21473.1"> <Uri>https://github.com/dotnet/wcf</Uri> <Sha>7f504aabb1988e9a093c1e74d8040bd52feb2f01</Sha> @@ -52,6 +48,14 @@ <Uri>https://github.com/dotnet/command-line-api</Uri> <Sha>5618b2d243ccdeb5c7e50a298b33b13036b4351b</Sha> </Dependency> + <Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100" Version="7.0.0-rc.1.22418.6"> + <Uri>https://github.com/dotnet/emsdk</Uri> + <Sha>eb3232eb90aac35a31134464fc498a5f1ddb239f</Sha> + </Dependency> + <Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100" Version="7.0.0-rc.1.22418.6"> + <Uri>https://github.com/dotnet/emsdk</Uri> + <Sha>eb3232eb90aac35a31134464fc498a5f1ddb239f</Sha> + </Dependency> </ProductDependencies> <ToolsetDependencies> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22418.4"> diff --git a/eng/Versions.props b/eng/Versions.props index e9e6ece7b74..1be7d663638 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,6 +7,7 @@ <MinorVersion>0</MinorVersion> <PatchVersion>0</PatchVersion> <SdkBandVersion>7.0.100</SdkBandVersion> + <PackageVersionNet6>6.0.8</PackageVersionNet6> <PreReleaseVersionLabel>rc</PreReleaseVersionLabel> <PreReleaseVersionIteration>1</PreReleaseVersionIteration> <!-- Set assembly version to align with major and minor version, @@ -21,6 +22,8 @@ <UsingToolXliff>false</UsingToolXliff> <LastReleasedStableAssemblyVersion>$(AssemblyVersion)</LastReleasedStableAssemblyVersion> <UsingToolMicrosoftNetCompilers>true</UsingToolMicrosoftNetCompilers> + <MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>7.0.0-rc.1.22418.6</MicrosoftNETWorkloadEmscriptennet6Manifest70100Version> + <MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>7.0.0-rc.1.22418.6</MicrosoftNETWorkloadEmscriptennet7Manifest70100Version> </PropertyGroup> <!-- For source generator support we need to target multiple versions of Roslyn in order to be able to run on older versions of Roslyn. @@ -176,7 +179,7 @@ <MicrosoftNETILLinkTasksVersion>7.0.100-1.22412.4</MicrosoftNETILLinkTasksVersion> <MicrosoftNETILLinkAnalyzerPackageVersion>$(MicrosoftNETILLinkTasksVersion)</MicrosoftNETILLinkAnalyzerPackageVersion> <!-- ICU --> - <MicrosoftNETCoreRuntimeICUTransportVersion>7.0.0-rc.1.22408.1</MicrosoftNETCoreRuntimeICUTransportVersion> + <MicrosoftNETCoreRuntimeICUTransportVersion>7.0.0-rc.1.22419.2</MicrosoftNETCoreRuntimeICUTransportVersion> <!-- MsQuic --> <MicrosoftNativeQuicMsQuicVersion>2.1</MicrosoftNativeQuicMsQuicVersion> <SystemNetMsQuicTransportVersion>7.0.0-alpha.1.22406.1</SystemNetMsQuicTransportVersion> @@ -190,8 +193,7 @@ <runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.22419.2</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion> <runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.22419.2</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion> <!-- emscripten / Node --> - <MicrosoftNETWorkloadEmscriptenManifest70100Version>7.0.0-rc.1.22411.1</MicrosoftNETWorkloadEmscriptenManifest70100Version> - <MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenManifest70100Version)</MicrosoftNETRuntimeEmscriptenVersion> + <MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version)</MicrosoftNETRuntimeEmscriptenVersion> <!-- workloads --> <SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion> <WixPackageVersion>1.0.0-v3.14.0.5722</WixPackageVersion> diff --git a/eng/pipelines/coreclr/perf-wasm-prepare-artifacts-steps.yml b/eng/pipelines/coreclr/perf-wasm-prepare-artifacts-steps.yml index 54c4baf70a3..d9bb50d068a 100644 --- a/eng/pipelines/coreclr/perf-wasm-prepare-artifacts-steps.yml +++ b/eng/pipelines/coreclr/perf-wasm-prepare-artifacts-steps.yml @@ -12,7 +12,7 @@ steps: - script: >- mkdir -p $(Build.SourcesDirectory)/artifacts/staging && - cp -r $(Build.SourcesDirectory)/artifacts/bin/dotnet-workload $(Build.SourcesDirectory)/artifacts/staging && + cp -r $(Build.SourcesDirectory)/artifacts/bin/dotnet-net7 $(Build.SourcesDirectory)/artifacts/staging && cp -r $(Build.SourcesDirectory)/artifacts/bin/microsoft.netcore.app.runtime.browser-wasm $(Build.SourcesDirectory)/artifacts/staging && cp -r $(Build.SourcesDirectory)/artifacts/bin/microsoft.netcore.app.ref $(Build.SourcesDirectory)/artifacts/staging displayName: "Prepare artifacts staging directory" diff --git a/eng/pipelines/coreclr/templates/perf-job.yml b/eng/pipelines/coreclr/templates/perf-job.yml index 60f603de796..9ad28b5f94a 100644 --- a/eng/pipelines/coreclr/templates/perf-job.yml +++ b/eng/pipelines/coreclr/templates/perf-job.yml @@ -184,7 +184,7 @@ jobs: - script: >- mkdir -p $(librariesDownloadDir)/bin/wasm/wasm-data && mkdir -p $(librariesDownloadDir)/bin/wasm/dotnet && - cp -r $(librariesDownloadDir)/BrowserWasm/staging/dotnet-workload/* $(librariesDownloadDir)/bin/wasm/dotnet && + cp -r $(librariesDownloadDir)/BrowserWasm/staging/dotnet-net7/* $(librariesDownloadDir)/bin/wasm/dotnet && cp src/mono/wasm/test-main.js $(librariesDownloadDir)/bin/wasm/wasm-data/test-main.js && find $(librariesDownloadDir)/bin/wasm -type d && find $(librariesDownloadDir)/bin/wasm -type f -exec chmod 664 {} \; diff --git a/eng/pipelines/coreclr/templates/run-scenarios-job.yml b/eng/pipelines/coreclr/templates/run-scenarios-job.yml index f22aa119d0d..8767e90fbe9 100644 --- a/eng/pipelines/coreclr/templates/run-scenarios-job.yml +++ b/eng/pipelines/coreclr/templates/run-scenarios-job.yml @@ -144,7 +144,7 @@ jobs: # copy wasm packs if running on wasm - script: >- mkdir -p $(librariesDownloadDir)/bin/wasm/data && - cp -r $(librariesDownloadDir)/BrowserWasm/staging/dotnet-workload $(librariesDownloadDir)/bin/wasm && + cp -r $(librariesDownloadDir)/BrowserWasm/staging/dotnet-net7 $(librariesDownloadDir)/bin/wasm && cp src/mono/wasm/test-main.js $(librariesDownloadDir)/bin/wasm/data/test-main.js && find $(librariesDownloadDir)/bin/wasm -type f -exec chmod 664 {} \; displayName: "Create wasm directory (Linux)" diff --git a/eng/testing/tests.wasm.targets b/eng/testing/tests.wasm.targets index 02af8e04189..7df09a51810 100644 --- a/eng/testing/tests.wasm.targets +++ b/eng/testing/tests.wasm.targets @@ -27,6 +27,8 @@ <_WasmStrictVersionMatch Condition="'$(ContinuousIntegrationBuild)' == 'true'">true</_WasmStrictVersionMatch> <XUnitUseRandomizedTestOrderer Condition="'$(XUnitUseRandomizedTestOrderer)' == '' and '$(IsTestProject)' == 'true'">true</XUnitUseRandomizedTestOrderer> <_UseWasmSymbolicator Condition="'$(TestTrimming)' != 'true'">true</_UseWasmSymbolicator> + <WasmIgnoreNet6WorkloadInstallErrors Condition="'$(WasmIgnoreNet6WorkloadInstallErrors)' == ''">true</WasmIgnoreNet6WorkloadInstallErrors> + <WasmIgnoreNet6WorkloadInstallErrors Condition="'$(WasmIgnoreNet6WorkloadInstallErrors)' != 'true'">false</WasmIgnoreNet6WorkloadInstallErrors> </PropertyGroup> <PropertyGroup Condition="'$(EnableAggressiveTrimming)' == 'true'"> @@ -138,14 +140,24 @@ </PropertyGroup> <ItemGroup> - <WorkloadIdForTesting Include="wasm-tools" - ManifestName="Microsoft.NET.Workload.Mono.ToolChain" + <WorkloadIdForTesting Include="wasm-tools;wasm-experimental" + ManifestName="Microsoft.NET.Workload.Mono.ToolChain.net7" + Variant="net7" Version="$(PackageVersion)" VersionBand="$(SdkBandVersion)" /> - <WorkloadIdForTesting Include="wasm-experimental" - ManifestName="Microsoft.NET.Workload.Mono.ToolChain" + + <WorkloadIdForTesting Include="wasm-tools-net6" + ManifestName="Microsoft.NET.Workload.Mono.ToolChain.net6" + Variant="net6" Version="$(PackageVersion)" - VersionBand="$(SdkBandVersion)" /> + VersionBand="$(SdkBandVersion)" + IgnoreErrors="$(WasmIgnoreNet6WorkloadInstallErrors)" + /> + + <WorkloadCombinationsToInstall Include="net7" Variants="net7" /> + <WorkloadCombinationsToInstall Include="net6" Variants="net6" /> + <WorkloadCombinationsToInstall Include="net6+7" Variants="net6;net7" /> + <!--<WorkloadCombinationsToInstall Include="none" />--> <WasmExtraFilesToDeploy Condition="'$(_UseWasmSymbolicator)' == 'true'" Include="$(MonoProjectRoot)wasm\data\wasm-symbol-patterns.txt" /> <WasmExtraFilesToDeploy Condition="'$(_UseWasmSymbolicator)' == 'true'" Include="$(ArtifactsBinDir)WasmSymbolicator\$(Configuration)\$(NetCoreAppToolCurrent)\WasmSymbolicator.dll" /> diff --git a/eng/testing/workloads-testing.targets b/eng/testing/workloads-testing.targets index 5da047758f8..0c41fc2bb5c 100644 --- a/eng/testing/workloads-testing.targets +++ b/eng/testing/workloads-testing.targets @@ -3,6 +3,10 @@ <PropertyGroup Condition="'$(TestUsingWorkloads)' == 'true'"> <!-- for non-ci builds, we install the sdk when tests are run --> <InstallWorkloadForTesting Condition="'$(ContinuousIntegrationBuild)' == 'true' and '$(ArchiveTests)' == 'true'">true</InstallWorkloadForTesting> + + <_SdkForWorkloadTestingBasePath>$(ArtifactsBinDir)</_SdkForWorkloadTestingBasePath> + <_SdkWithNoWorkloadPath>$([MSBuild]::NormalizeDirectory($(_SdkForWorkloadTestingBasePath), 'dotnet-none'))</_SdkWithNoWorkloadPath> + <_SdkWithNoWorkloadStampPath>$([MSBuild]::NormalizePath($(_SdkWithNoWorkloadPath), '.version-$(SdkVersionForWorkloadTesting).stamp'))</_SdkWithNoWorkloadStampPath> </PropertyGroup> <ItemGroup> @@ -12,43 +16,21 @@ <_DefaultPropsForNuGetBuild Include="ContinuousIntegrationBuild=$(ContinuousIntegrationBuild)" /> </ItemGroup> - <Target Name="ProvisionSdkForWorkloadTesting" - DependsOnTargets="_ProvisionSdkWithNoWorkload" - Condition="!Exists($(SdkWithNoWorkloadStampPath)) or !Exists($(SdkWithWorkloadStampPath))"> - - <Error Text="%24(SdkWithWorkloadForTestingPath) is not set" Condition="'$(SdkWithWorkloadForTestingPath)' == ''" /> + <Target Name="_ProvisionDotNetForWorkloadTesting" Condition="!Exists($(_SdkWithNoWorkloadStampPath))"> + <Error Text="%24(_SdkWithNoWorkloadPath) is not set" Condition="'$(_SdkWithNoWorkloadPath)' == ''" /> - <Message Text="** Installing sdk $(SdkVersionForWorkloadTesting) for workload based tests into $(SdkWithWorkloadForTestingPath)" + <Message Text="** Installing sdk $(SdkVersionForWorkloadTesting) for workload based tests into $(_SdkWithNoWorkloadPath)" Condition="'$(SdkVersionForWorkloadTesting)' != ''" Importance="High" /> - <Message Text="** Installing latest sdk for workload based tests into $(SdkWithWorkloadForTestingPath)" + <Message Text="** Installing latest sdk for workload based tests into $(_SdkWithNoWorkloadPath)" Condition="'$(SdkVersionForWorkloadTesting)' == ''" Importance="High" /> - <RemoveDir Directories="$(SdkWithWorkloadForTestingPath)" /> - <MakeDir Directories="$(SdkWithWorkloadForTestingPath)" /> - <ItemGroup> - <_SourceFiles Include="$(SdkWithNoWorkloadForTestingPath)\**" /> + <_SdkWithNoWorkloadTarget Include="none" InstallPath="$(_SdkWithNoWorkloadPath)" /> </ItemGroup> - - <Copy SourceFiles="@(_SourceFiles)" DestinationFolder="$(SdkWithWorkloadForTestingPath)\%(_SourceFiles.RecursiveDir)" /> - - <WriteLinesToFile File="$(SdkWithWorkloadStampPath)" Lines="" Overwrite="true" /> - </Target> - - <Target Name="_ProvisionSdkWithNoWorkload" Condition="!Exists($(SdkWithNoWorkloadStampPath))"> - <Error Text="%24(SdkWithNoWorkloadForTestingPath) is not set" Condition="'$(SdkWithNoWorkloadForTestingPath)' == ''" /> - - <Message Text="** Installing sdk $(SdkVersionForWorkloadTesting) for workload based tests into $(SdkWithNoWorkloadForTestingPath)" - Condition="'$(SdkVersionForWorkloadTesting)' != ''" - Importance="High" /> - <Message Text="** Installing latest sdk for workload based tests into $(SdkWithNoWorkloadForTestingPath)" - Condition="'$(SdkVersionForWorkloadTesting)' == ''" - Importance="High" /> - - <RemoveDir Directories="$(SdkWithNoWorkloadForTestingPath)" /> - <MakeDir Directories="$(SdkWithNoWorkloadForTestingPath)" /> + <RemoveDir Directories="$(_SdkWithNoWorkloadPath)" /> + <MakeDir Directories="$(_SdkWithNoWorkloadPath)" /> <PropertyGroup> <_DotNetInstallScriptName Condition="!$([MSBuild]::IsOSPlatform('windows'))">dotnet-install.sh</_DotNetInstallScriptName> @@ -59,16 +41,16 @@ <PropertyGroup Condition="'$(SdkVersionForWorkloadTesting)' != ''"> <_DotNetInstallCommand Condition="!$([MSBuild]::IsOSPlatform('windows'))" - >$(_DotNetInstallScriptPath) -i $(SdkWithNoWorkloadForTestingPath) -v $(SdkVersionForWorkloadTesting)</_DotNetInstallCommand> + >$(_DotNetInstallScriptPath) -i $(_SdkWithNoWorkloadPath) -v $(SdkVersionForWorkloadTesting)</_DotNetInstallCommand> <_DotNetInstallCommand Condition="$([MSBuild]::IsOSPlatform('windows'))" - >$(_DotNetInstallScriptPath) -InstallDir $(SdkWithNoWorkloadForTestingPath) -Version $(SdkVersionForWorkloadTesting)</_DotNetInstallCommand> + >$(_DotNetInstallScriptPath) -InstallDir $(_SdkWithNoWorkloadPath) -Version $(SdkVersionForWorkloadTesting)</_DotNetInstallCommand> </PropertyGroup> <PropertyGroup Condition="'$(SdkVersionForWorkloadTesting)' == ''"> <_DotNetInstallCommand Condition="!$([MSBuild]::IsOSPlatform('windows'))" - >$(_DotNetInstallScriptPath) -i $(SdkWithNoWorkloadForTestingPath) -v latest -q daily --channel 7.0</_DotNetInstallCommand> + >$(_DotNetInstallScriptPath) -i $(_SdkWithNoWorkloadPath) -v latest -q daily --channel 7.0</_DotNetInstallCommand> <_DotNetInstallCommand Condition="$([MSBuild]::IsOSPlatform('windows'))" - >$(_DotNetInstallScriptPath) -InstallDir $(SdkWithNoWorkloadForTestingPath) -Quality daily -Channel 7.0</_DotNetInstallCommand> + >$(_DotNetInstallScriptPath) -InstallDir $(_SdkWithNoWorkloadPath) -Quality daily -Channel 7.0</_DotNetInstallCommand> </PropertyGroup> <DownloadFile SourceUrl="https://dot.net/v1/$(_DotNetInstallScriptName)" @@ -82,13 +64,17 @@ <Exec Condition="$([MSBuild]::IsOSPlatform('windows'))" Command='powershell -ExecutionPolicy ByPass -NoProfile -command "& $(_DotNetInstallCommand)"' /> - - <WriteLinesToFile File="$(SdkWithNoWorkloadStampPath)" Lines="" Overwrite="true" /> </Target> <Target Name="GetWorkloadInputs"> <ItemGroup> <AvailableNuGetsInArtifacts Include="$(LibrariesShippingPackagesDir)\*.nupkg" /> + + <!--<_SdkWithWorkloadToInstall Include="none" Version="none" />--> + <_SdkWithWorkloadToInstall Include="@(WorkloadCombinationsToInstall)" /> + <_SdkWithWorkloadToInstall InstallPath="$(_SdkForWorkloadTestingBasePath)\dotnet-%(Identity)" /> + <!--<_SdkWithWorkloadToInstall StampPath="%(InstallPath)\version-%(Version).stamp" Condition="'%(Version)' != ''" />--> + <_SdkWithWorkloadToInstall StampPath="%(InstallPath)\version.stamp" /> </ItemGroup> <Error Text="Cannot find any nupkg files in $(LibrariesShippingPackagesDir), needed for workloads" Condition="@(AvailableNuGetsInArtifacts->Count()) == 0" /> @@ -104,7 +90,7 @@ <Target Name="InstallWorkloadUsingArtifacts" AfterTargets="ArchiveTests" - DependsOnTargets="_GetNuGetsToBuild;_PreparePackagesForWorkloadInstall;ProvisionSdkForWorkloadTesting;GetWorkloadInputs;_InstallWorkload;_UpdateManifestsForSdkWithNoWorkload" + DependsOnTargets="_GetNuGetsToBuild;_PreparePackagesForWorkloadInstall;GetWorkloadInputs;_ProvisionDotNetForWorkloadTesting;_InstallWorkloads" Condition="'$(InstallWorkloadForTesting)' == 'true'" /> <Target Name="_GetNuGetsToBuild" Returns="@(_NuGetsToBuild)" DependsOnTargets="_GetRuntimePackNuGetsToBuild"> @@ -168,7 +154,7 @@ </ItemGroup> <Error Condition="@(_RuntimePackNugetAvailable -> Count()) != 3 and @(_RuntimePackNugetAvailable -> Count()) != 1" - Text="Multiple runtime pack nugets found. Expected to find either one or three in $(LibrariesShippingPackagesDir): @(_RuntimePackNugetAvailable->'%(FileName)%(Extension)')" /> + Text="Expected to find either one or three in $(LibrariesShippingPackagesDir): @(_RuntimePackNugetAvailable->'%(FileName)%(Extension)')" /> <ItemGroup> <_BuildVariants Include="multithread" Condition="'$(_DefaultBuildVariant)' != '.multithread.'" /> @@ -202,42 +188,22 @@ *******************" /> </Target> - <Target Name="_InstallWorkload" + <Target Name="_InstallWorkloads" Inputs="@(AvailableNuGetsInArtifacts)" - Outputs="$(SdkWithWorkload_WorkloadStampPath)"> + Outputs="@(_SdkWithWorkloadToInstall->'%(StampPath)')"> <ItemGroup> <_BuiltNuGets Include="$(LibrariesShippingPackagesDir)\*.nupkg" /> </ItemGroup> - <PropertyGroup> - </PropertyGroup> - - <Error Text="Could not find cross compiler nupkg at $(_AOTCrossNuGetPath). Found packages: @(_BuiltNuGets)" - Condition="!Exists($(_AOTCrossNuGetPath))" /> - <Message Text="Packages found in $(LibrariesShippingPackagesDir): @(_BuiltNuGets)" Importance="Low" /> <InstallWorkloadFromArtifacts WorkloadIds="@(WorkloadIdForTesting)" + InstallTargets="@(_SdkWithWorkloadToInstall)" VersionBand="$(SdkBandVersion)" LocalNuGetsPath="$(LibrariesShippingPackagesDir)" TemplateNuGetConfigPath="$(RepoRoot)NuGet.config" - SdkDir="$(SdkWithWorkloadForTestingPath)" /> - <WriteLinesToFile File="$(SdkWithWorkload_WorkloadStampPath)" Lines="" Overwrite="true" /> - </Target> - - <Target Name="_UpdateManifestsForSdkWithNoWorkload" - Inputs="@(AvailableNuGetsInArtifacts)" - Outputs="$(SdkWithNoWorkload_WorkloadStampPath)"> - - <InstallWorkloadFromArtifacts - WorkloadIds="@(WorkloadIdForTesting)" - VersionBand="$(SdkBandVersion)" - LocalNuGetsPath="$(LibrariesShippingPackagesDir)" - TemplateNuGetConfigPath="$(RepoRoot)NuGet.config" - SdkDir="$(SdkWithNoWorkloadForTestingPath)" - OnlyUpdateManifests="true"/> - - <WriteLinesToFile File="$(SdkWithNoWorkload_WorkloadStampPath)" Lines="" Overwrite="true" /> + SdkWithNoWorkloadInstalledPath="$(_SdkWithNoWorkloadPath)" + /> </Target> </Project> |