Ensure ILRepack is only run on Windows, as well as pack/push

devlooped · May 16, 2024 · 2598554 · 2598554
1 parent 3d58fc6
commit 2598554
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -54,8 +54,6 @@ jobs:
           fetch-depth: 0
 
       - name: 🙏 build
-        env:
-          CustomAfterMicrosoftCommonTargets: ${{ github.workspace }}/src/NuGetize.targets
         run: dotnet build -m:1 -p:VersionLabel="$GITHUB_REF.$GITHUB_RUN_NUMBER"
 
       - name: ⚙ GNU grep
@@ -68,11 +66,9 @@ jobs:
         uses: ./.github/workflows/test
 
       - name: 📦 pack
-        env:
-          CustomAfterMicrosoftCommonTargets: ${{ github.workspace }}/src/NuGetize.targets
         run: dotnet pack -m:1 -p:VersionLabel="$GITHUB_REF.$GITHUB_RUN_NUMBER"
 
-      # Only push CI package to sleet feed if building on ubuntu (fastest)
+      # Only push CI package to sleet feed if building on windows (can't run ILRepack on linux/macOS)
       - name: 🚀 sleet
         env:
           SLEET_CONNECTION: ${{ secrets.SLEET_CONNECTION }}

diff --git a/src/CredentialManager/CredentialManager.csproj b/src/CredentialManager/CredentialManager.csproj
@@ -28,7 +28,7 @@ Usage:
           Inputs="@(IntermediateAssembly -&gt; '%(FullPath)')" 
           Outputs="$(IntermediateOutputPath)ilrepack.txt" 
           Returns="@(MergedAssemblies)" 
-          Condition="Exists(@(IntermediateAssembly -&gt; '%(FullPath)'))">
+          Condition="$(OS) == 'WINDOWS_NT' And Exists(@(IntermediateAssembly -&gt; '%(FullPath)'))">
     <Message Text="Repacking" Importance="high" />
     <ItemGroup>
       <MergedAssemblies Include="@(ReferencePath)" Condition="'%(Extension)' == '.dll' And $([MSBuild]::ValueOrDefault('%(FileName)', '')) == 'Core'" />