Remove osx-x64

vedantmgoyal9 · Jun 22, 2024 · c779ba8 · c779ba8
1 parent e2a316e
commit c779ba8
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 91 deletions.
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -32,10 +32,6 @@ jobs:
           # - os: ubuntu-latest
           #   dotnet-runtime: linux-arm64
           #   rust-target: aarch64-unknown-linux-gnu
-          - os: macos-13
-            dotnet-runtime: osx-x64
-            rust-target: x86_64-apple-darwin
-            bin-suffix: macos-x64
           - os: macos-latest
             dotnet-runtime: osx-arm64
             rust-target: aarch64-apple-darwin

diff --git a/src/WingetCreateCLI/WingetCreateCLI.csproj b/src/WingetCreateCLI/WingetCreateCLI.csproj
@@ -6,68 +6,50 @@
 		<RootNamespace>Microsoft.WingetCreateCLI</RootNamespace>
 		<Version>1.6</Version>
 		<Platforms>x64;ARM64</Platforms>
-		<RuntimeIdentifiers>win-x64;win-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>
+		<RuntimeIdentifiers>win-x64;win-arm64;linux-x64;linux-arm64;osx-arm64</RuntimeIdentifiers>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 		<DefineConstants>TELEMETRYEVENTSOURCE_PUBLIC</DefineConstants>
 		<SignAssembly>true</SignAssembly>
-    <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
+		<IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
+
+		<IsWindows Condition="$(RuntimeIdentifier.StartsWith('win')) Or '$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))'=='true'">true</IsWindows>
 	</PropertyGroup>
 
-  <PropertyGroup Condition="'$(RuntimeIdentifier)' != ''">
-    <IsWindows Condition="$(RuntimeIdentifier.StartsWith('win'))">true</IsWindows>
-    <IsOSX Condition="$(RuntimeIdentifier.StartsWith('osx'))">true</IsOSX>
-    <IsLinux Condition="$(RuntimeIdentifier.StartsWith('linux'))">true</IsLinux>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(RuntimeIdentifier)' == ''">
-    <IsWindows
-      Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))'=='true'"
-    >true</IsWindows>
-    <IsOSX
-      Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))'=='true'"
-    >true</IsOSX>
-    <IsLinux
-      Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))'=='true'"
-    >true</IsLinux>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(IsWindows)'=='true'">
-    <TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(IsLinux)'=='true' Or '$(IsOSX)'=='true'">
-    <TargetFramework>net8.0</TargetFramework>
-    <SelfContained>true</SelfContained>
-    <PublishSingleFile>true</PublishSingleFile>
-  </PropertyGroup>
+	<PropertyGroup Condition="'$(IsWindows)'=='true'">
+		<TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <AdditionalFiles Include="..\stylecop.json" />
-  </ItemGroup>
+	<PropertyGroup Condition="'$(IsWindows)'!='true'">
+		<TargetFramework>net8.0</TargetFramework>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="AutoMapper" Version="13.0.1" />
-    <PackageReference Include="CommandLineParser" Version="2.9.1" />
+	<ItemGroup>
+		<AdditionalFiles Include="..\stylecop.json" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<PackageReference Include="AutoMapper" Version="13.0.1" />
+		<PackageReference Include="CommandLineParser" Version="2.9.1" />
     <PackageReference Condition="'$(IsWindows)'=='true'" Include="DesktopBridge.Helpers"
       Version="1.2.2" />
-    <PackageReference Include="NSwag.MSBuild" Version="14.0.3">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Sharprompt" Version="2.4.5" />
-    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
+		<PackageReference Include="NSwag.MSBuild" Version="14.0.3">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+		<PackageReference Include="Sharprompt" Version="2.4.5" />
+		<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
     <PackageReference Condition="'$(IsWindows)'=='true'"
       Include="System.Security.Cryptography.ProtectedData" Version="8.0.0" />
-  </ItemGroup>
+	</ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\WingetCreateCore\WingetCreateCore.csproj" />
-  </ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\WingetCreateCore\WingetCreateCore.csproj" />
+	</ItemGroup>
 
-  <!--This
+	<!--This
     is to workaround a similar issue as to what's
   described at https://github.com/dotnet/runtime/issues/3807. When the wapproj is published, the
     native
@@ -84,38 +66,38 @@
   This modifies the inputs to GenerateBuildDependencyFile to remove Wingetutil.pdb from the deps.json
     file when it's generated.
   -->
-  <Target Name="StripNativePDBFromDepsJson" BeforeTargets="GenerateBuildDependencyFile">
-    <ItemGroup>
+	<Target Name="StripNativePDBFromDepsJson" BeforeTargets="GenerateBuildDependencyFile">
+		<ItemGroup>
       <RuntimeTargetsCopyLocalItems Remove="@(RuntimeTargetsCopyLocalItems)"
         Condition="'%(RuntimeTargetsCopyLocalItems.Extension)' == '.pdb' AND %(RuntimeTargetsCopyLocalItems.NuGetPackageId) == 'Microsoft.WindowsPackageManager.Utils'" />
       <NativeCopyLocalItems Remove="@(NativeCopyLocalItems)"
         Condition="'%(NativeCopyLocalItems.Extension)' == '.pdb' AND %(NativeCopyLocalItems.NuGetPackageId) == 'Microsoft.WindowsPackageManager.Utils'" />
-    </ItemGroup>
-  </Target>
-
-  <ItemGroup>
-    <Compile Update="Properties\Resources.Designer.cs">
-      <DependentUpon>Resources.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <!-- The localized resources are dropped in \Localization\Resources as part of the patch
+		</ItemGroup>
+	</Target>
+
+	<ItemGroup>
+		<Compile Update="Properties\Resources.Designer.cs">
+			<DependentUpon>Resources.resx</DependentUpon>
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+		</Compile>
+	</ItemGroup>
+
+	<ItemGroup>
+		<!-- The localized resources are dropped in \Localization\Resources as part of the patch
         file from TouchDown. We can't simply Include them, as they must appear to be under the
          Properties directory to be properly included. We can fake this by using the <Link> tag which
         includes them virtually under specified directory -->
-    <EmbeddedResource Include="..\..\Localization\Resources\**\*.resx" LinkBase="Properties">
-      <Link>%(LinkBase)\%(Filename)%(Extension)</Link>
-      <Visible>false</Visible>
-    </EmbeddedResource>
-
-    <EmbeddedResource Update="Properties\Resources.resx">
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <Generator>PublicResXFileCodeGenerator</Generator>
-    </EmbeddedResource>
-  </ItemGroup>
+		<EmbeddedResource Include="..\..\Localization\Resources\**\*.resx" LinkBase="Properties">
+			<Link>%(LinkBase)\%(Filename)%(Extension)</Link>
+			<Visible>false</Visible>
+		</EmbeddedResource>
+
+		<EmbeddedResource Update="Properties\Resources.resx">
+			<LastGenOutput>Resources.Designer.cs</LastGenOutput>
+			<Generator>PublicResXFileCodeGenerator</Generator>
+		</EmbeddedResource>
+	</ItemGroup>
 
   <!--Include
     VCLib binary dependencies-->
@@ -131,13 +113,13 @@
     </None>
   </ItemGroup>
 
-  <ItemGroup>
-    <SettingSchema Include="$(ProjectDir)\Schemas\settings.schema.0.1.json" ModelName="Settings" />
-  </ItemGroup>
+	<ItemGroup>
+		<SettingSchema Include="$(ProjectDir)\Schemas\settings.schema.0.1.json" ModelName="Settings" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Models\" />
-  </ItemGroup>
+	<ItemGroup>
+		<Folder Include="Models\" />
+	</ItemGroup>
 
   <ItemGroup>
     <None Include="..\..\README.md">
@@ -159,5 +141,5 @@
 
     <Exec
       Command="$(NSwagExe_Net80) jsonschema2csclient /name:%(ModelName)Manifest /namespace:Microsoft.WingetCreateCLI.Models.%(SettingSchema.ModelName) /input:%(FullPath) /output:$(ProjectDir)Models\%(ModelName)Model.cs /InlineNamedArrays:true /RequiredPropertiesMustBeDefined:false /ArrayType:System.Collections.Generic.List /ArrayInstanceType:System.Collections.Generic.List" />
-  </Target>
+	</Target>
 </Project>
diff --git a/src/WingetCreateCore/WingetCreateCore.csproj b/src/WingetCreateCore/WingetCreateCore.csproj
@@ -5,7 +5,7 @@
 		<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
 		<RootNamespace>Microsoft.WingetCreateCore</RootNamespace>
 		<Platforms>x64;ARM64</Platforms>
-		<RuntimeIdentifiers>win-x64;win-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>
+		<RuntimeIdentifiers>win-x64;win-arm64;linux-x64;linux-arm64;osx-arm64</RuntimeIdentifiers>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 	</PropertyGroup>
@@ -111,11 +111,6 @@
 			<Link>libmsi.so</Link>
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
-		<None Condition="'$(IsOSX)'=='true' And '$(IsX64)'=='true' And '$(CI)'=='true'"
-		  Include="$(MSBuildThisFileDirectory)\Common\Msi\rust-msi\target\x86_64-apple-darwin\release\libmsi_ffi.dylib">
-			<Link>libmsi.dylib</Link>
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</None>
 		<None Condition="'$(IsOSX)'=='true' And '$(IsArm64)'=='true' And '$(CI)'=='true'"
 		  Include="$(MSBuildThisFileDirectory)\Common\Msi\rust-msi\target\aarch64-apple-darwin\release\libmsi_ffi.dylib">
 			<Link>libmsi.dylib</Link>