From ae6f888dbbd1ad8b2dea5d17ff328111ea671dff Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Wed, 5 May 2021 21:02:59 -0500 Subject: [PATCH] [tests] delete workload manifest folder from main Context: https://devdiv.visualstudio.com/DevDiv/_build/results?buildId=4728381&view=ms.vss-test-web.build-test-results-tab&runId=21435278&resultId=100052&paneView=attachments Since 5400522d, if a previous CI machine runs a build from `main` followed by `release/6.0.1xx-preview4`, it could encounter the error: UnnamedProject.csproj: warning MSB4242: The SDK resolver "Microsoft.DotNet.MSBuildWorkloadSdkResolver" failed to run. An item with the same key has already been added. Key: microsoft-android-sdk-full Microsoft.NET.Sdk.ImportWorkloads.props(14,3): warning MSB4242: The SDK resolver "Microsoft.DotNet.MSBuildWorkloadSdkResolver" failed to run. An item with the same key has already been added. Key: microsoft-android-sdk-full Microsoft.NET.Sdk.ImportWorkloads.props(14,38): error MSB4236: The SDK 'Microsoft.NET.SDK.WorkloadAutoImportPropsLocator' specified could not be found. This could happen if both directories exist: dotnet/sdk-manifest/6.0.100/Microsoft.NET.Workload.Android dotnet/sdk-manifest/6.0.100/Microsoft.NET.Sdk.Android Which would define the same Android workload twice. There might be a more comprehensive solution here going forward, but this should at least fix builds on our release branch for .NET 6 Preview 4. --- build-tools/create-packs/Directory.Build.targets | 1 + 1 file changed, 1 insertion(+) diff --git a/build-tools/create-packs/Directory.Build.targets b/build-tools/create-packs/Directory.Build.targets index f63dcb2821d..9993b400e1c 100644 --- a/build-tools/create-packs/Directory.Build.targets +++ b/build-tools/create-packs/Directory.Build.targets @@ -150,6 +150,7 @@ <_PackFilesToDelete Include="$(DotNetPreviewPath)sdk-manifests\$(DotNetPreviewVersionBand)\Microsoft.Android.Workload\**\*.*" /> <_PackFilesToDelete Include="$(DotNetPreviewPath)sdk-manifests\$(DotNetPreviewVersionBand)\Microsoft.NET.Workload.Android\**\*.*" /> + <_PackFilesToDelete Include="$(DotNetPreviewPath)sdk-manifests\$(DotNetPreviewVersionBand)\Microsoft.NET.Sdk.Android\**\*.*" /> <_PackFilesToDelete Include="$(DotNetPreviewPath)packs\Microsoft.Android*\**\*.*" /> <_PackFilesToDelete Include="$(DotNetPreviewPath)template-packs\Microsoft.Android.Templates.*.nupkg" />