Skip to content

[One .NET] remove EnableWorkloadResolver.sentinel #5909

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

Merged
jonathanpeppers merged 1 commit into from
May 10, 2021
Merged

[One .NET] remove EnableWorkloadResolver.sentinel #5909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 0 additions & 29 deletions ...arin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/GenerateWixFile.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ public class GenerateWixFile : Task
[Required]
public string DotNetPath { get; set; }

[Required]
public string DotNetVersion { get; set; }

[Required]
public string MSIVersion { get; set; }

Expand All @@ -44,38 +41,12 @@ public override bool Execute ()
// Components
componentWriter.WriteStartElement ("ComponentGroup");
componentWriter.WriteAttributeString ("Id", "ProductComponents");
componentWriter.WriteStartElement ("ComponentRef");
componentWriter.WriteAttributeString ("Id", "EnableWorkloadResolver");
componentWriter.WriteEndElement (); // </ComponentRef>

// dotnet
packWriter.WriteStartElement ("Directory");
packWriter.WriteAttributeString ("Id", "dotnet");
packWriter.WriteAttributeString ("Name", "dotnet");

// sdk
packWriter.WriteStartElement ("Directory");
packWriter.WriteAttributeString ("Id", "sdk");
packWriter.WriteAttributeString ("Name", "sdk");

// DOTNETVERSION
packWriter.WriteStartElement ("Directory");
packWriter.WriteAttributeString ("Id", "DOTNETVERSION");
packWriter.WriteAttributeString ("Name", DotNetVersion);
packWriter.WriteAttributeString ("FileSource", Path.Combine (DotNetPath, "sdk", DotNetVersion));

// EnableWorkloadResolver
packWriter.WriteStartElement ("Component");
packWriter.WriteAttributeString ("Id", "EnableWorkloadResolver");
packWriter.WriteStartElement ("File");
packWriter.WriteAttributeString ("Id", "EnableWorkloadResolver");
packWriter.WriteAttributeString ("Name", "EnableWorkloadResolver.sentinel");
packWriter.WriteAttributeString ("KeyPath", "yes");
packWriter.WriteEndElement (); // </File>
packWriter.WriteEndElement (); // </Component>
packWriter.WriteEndElement (); // </Directory> DOTNETVERSION
packWriter.WriteEndElement (); // </Directory> sdk

// sdk-manifests
var sdk_manifests_root = Path.Combine (DotNetPath, "sdk-manifests");
packWriter.WriteStartElement ("Directory");
Expand Down
1 change: 0 additions & 1 deletion build-tools/create-dotnet-msi/create-dotnet-msi.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@
Template="$(_WixTemplate)"
DestinationFile="$(_WixFile)"
DotNetPath="$(DotNetPreviewPath)"
DotNetVersion="$(MicrosoftDotnetSdkInternalPackageVersion)"
MSIVersion="$(AndroidMSIVersion)"
/>
<ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion build-tools/create-dotnet-pkg/create-dotnet-pkg.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
<DotNetPayloadDir>$(PayloadDir)\usr\local\share\dotnet\</DotNetPayloadDir>
</PropertyGroup>
<ItemGroup>
<_FilesToCopy Include="$(DotNetPreviewPath)\sdk\$(MicrosoftDotnetSdkInternalPackageVersion)\EnableWorkloadResolver.sentinel" />
<_FilesToCopy Include="$(DotNetPreviewPath)\sdk-manifests\$(DotNetPreviewVersionBand)\Microsoft.NET.Sdk.Android\**\*" />
<_FilesToCopy Include="$(DotNetPreviewPath)\packs\Microsoft.Android.Ref\**\*" />
<_FilesToCopy Include="$(DotNetPreviewPath)\packs\Microsoft.Android.Sdk.Darwin\**\*" />
Expand Down
7 changes: 0 additions & 7 deletions build-tools/create-packs/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@

<PropertyGroup>
<_MonoAndroidNETOutputDir>$(XAInstallPrefix)xbuild-frameworks\Microsoft.Android\net6.0\</_MonoAndroidNETOutputDir>
<_WorkloadResolverFlagFile>$(DotNetPreviewPath)sdk\$(MicrosoftDotnetSdkInternalPackageVersion)\EnableWorkloadResolver.sentinel</_WorkloadResolverFlagFile>
</PropertyGroup>

<!-- LICENSE setup -->
Expand Down Expand Up @@ -133,11 +132,6 @@
/>
<!-- Some files had timestamps in the future -->
<Touch Files="@(_FilesToTouch)" />
<MakeDir Directories="$([System.IO.Path]::GetDirectoryName ($(_WorkloadResolverFlagFile)))" />
<Touch
Files="$(_WorkloadResolverFlagFile)"
AlwaysCreate="true"
/>
</Target>

<Target Name="DeleteExtractedWorkloadPacks" >
Expand All @@ -148,7 +142,6 @@
<_PackFilesToDelete Include="$(DotNetPreviewPath)template-packs\Microsoft.Android.Templates.*.nupkg" />
</ItemGroup>
<RemoveDir Directories="%(_PackFilesToDelete.RootDir)%(_PackFilesToDelete.Directory)" />
<Delete Files="$(_WorkloadResolverFlagFile)" />
</Target>

<Target Name="PushManifestToBuildAssetRegistry" >
Expand Down