Merge pull request #254 from Redth/fix-glob

Fix glob to correctly include/exclude ios/mac/net

Author: jfversluis

.github/workflows/main.yml

@@ -30,7 +30,7 @@ jobs:
         & dotnet workload install maui ios android maccatalyst
 
     - name: Build
-      run: dotnet build --configuration Release
+      run: dotnet build --configuration Release --verbosity normal
    # - name: Test
    #   run: dotnet test --configuration Release
     - name: Package NuGets
@@ -43,9 +43,19 @@ jobs:
         echo "PACKAGE VERSION: $VERSION"
 
         New-Item -ItemType Directory -Force -Path .\artifacts
-        dotnet pack --output ./artifacts --configuration Release -p:Version=$VERSION -p:PackageVersion=$VERSION ./ZXing.Net.MAUI/ZXing.Net.MAUI.csproj
-        dotnet pack --output ./artifacts --configuration Release -p:Version=$VERSION -p:PackageVersion=$VERSION ./ZXing.Net.MAUI.Controls/ZXing.Net.MAUI.Controls.csproj
-        dotnet pack --output ./artifacts --configuration Release -p:Version=$VERSION -p:PackageVersion=$VERSION ./ZXing.Net.MAUI.Comet/ZXing.Net.MAUI.Comet.csproj
+        
+        # Pack with --no-build since we already built, and add error handling
+        Write-Host "Packing ZXing.Net.MAUI..."
+        dotnet pack --output ./artifacts --configuration Release --no-build --verbosity normal -p:Version=$VERSION -p:PackageVersion=$VERSION ./ZXing.Net.MAUI/ZXing.Net.MAUI.csproj
+        if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
+        
+        Write-Host "Packing ZXing.Net.MAUI.Controls..."
+        dotnet pack --output ./artifacts --configuration Release --no-build --verbosity normal -p:Version=$VERSION -p:PackageVersion=$VERSION ./ZXing.Net.MAUI.Controls/ZXing.Net.MAUI.Controls.csproj
+        if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
+        
+        Write-Host "Packing ZXing.Net.MAUI.Comet..."
+        dotnet pack --output ./artifacts --configuration Release --no-build --verbosity normal -p:Version=$VERSION -p:PackageVersion=$VERSION ./ZXing.Net.MAUI.Comet/ZXing.Net.MAUI.Comet.csproj
+        if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
         
     - name: Artifacts
       uses: actions/upload-artifact@v4

ZXing.Net.MAUI/ZXing.Net.MAUI.csproj

@@ -54,10 +54,10 @@
 			<ExcludeFromCurrentConfiguration>true</ExcludeFromCurrentConfiguration>
 		</Compile>
 
-		<Compile Condition=" '$(TargetPlatformIdentifier)' == 'ios' " Update="*\*.ios*$(DefaultLanguageSourceExtension)">
+		<Compile Condition=" '$(TargetPlatformIdentifier)' == 'ios' " Update="**\*.ios*$(DefaultLanguageSourceExtension)">
 			<ExcludeFromCurrentConfiguration>False</ExcludeFromCurrentConfiguration>
 		</Compile>
-		<Compile Condition=" '$(TargetPlatformIdentifier)' == 'maccatalyst' " Update="**\*.maccatalyst*$(DefaultLanguageSourceExtension)">
+		<Compile Condition=" '$(TargetPlatformIdentifier)' == 'maccatalyst' " Update="**\*.ios*$(DefaultLanguageSourceExtension);**\*.maccatalyst*$(DefaultLanguageSourceExtension)">
 			<ExcludeFromCurrentConfiguration>False</ExcludeFromCurrentConfiguration>
 		</Compile>
 		<Compile Condition=" '$(TargetPlatformIdentifier)' == 'android' " Update="**\*.android*$(DefaultLanguageSourceExtension)">