Merge branch 'release-0.18.1'

ubisoft · Dec 21, 2021 · cac2a9d · cac2a9d
2 parents 71a89c8 + 1de07e9
commit cac2a9d
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 17 deletions.
diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
@@ -217,6 +217,21 @@ jobs:
           & $env:COMPILE_BATCH projects\fastbuildsample_vs2019_win64.sln "${{ matrix.configuration }}" "x64"
           projects\output\win64\${{ matrix.configuration }}\fastbuildsimpleexecutable.exe
 
+      - name: Fixup Android SDK dx.bat and dx.jar
+        if: runner.os == 'Windows'
+        shell: bash
+        run: | # starting with Android SDK 31, DX (which was deprecated) has been replaced by D8, which seems called by the VS gradle. Since it uses the same arguments, we cheat by mklinking d8 to dx
+          ln -s ${ANDROID_HOME}/build-tools/32.0.0/d8.bat ${ANDROID_HOME}/build-tools/32.0.0/dx.bat
+          ln -s ${ANDROID_HOME}/build-tools/32.0.0/lib/d8.jar ${ANDROID_HOME}/build-tools/32.0.0/lib/dx.jar
+
+      - name: HelloAndroid ${{ matrix.configuration }}
+        if: runner.os == 'Windows'
+        working-directory: 'samples/HelloAndroid'
+        run: |
+          & $env:SHARPMAKE_WIN_EXE "/sources('HelloAndroid.main.sharpmake.cs')"
+          & $env:COMPILE_BATCH codebase\temp\solutions\HelloAndroid_android_vs2019.sln "${{ matrix.configuration }}_NoBlob" "arm64_v8a"
+          & $env:COMPILE_BATCH codebase\temp\solutions\HelloAndroid_android_vs2019.sln "${{ matrix.configuration }}_NoBlob" "x86_64"
+
       - name: HelloClangCl debug
         if: runner.os == 'Windows' && matrix.configuration == 'debug'
         working-directory: 'samples/HelloClangCl'
@@ -286,17 +301,6 @@ jobs:
           cd codebase/temp/bin/mac_${{ matrix.configuration }}
           DYLD_LIBRARY_PATH=. ./exe
 
-      - name: HelloAndroid ${{ matrix.configuration }}
-        if: runner.os == 'Windows'
-        working-directory: 'samples/HelloAndroid'
-        env:
-            REMOVE_ANDROID_BUILD_TOOLS_VERSION: 31.0.0
-        run: | #Installed Build Tools revision 31.0.0 is corrupted. Need to remove and install again using the SDK Manager.
-          & $env:SHARPMAKE_WIN_EXE "/sources('HelloAndroid.main.sharpmake.cs')"
-          & $env:ANDROID_HOME/tools/bin/sdkmanager --uninstall "build-tools;${{ env.REMOVE_ANDROID_BUILD_TOOLS_VERSION }}"
-          & $env:COMPILE_BATCH codebase\temp\solutions\HelloAndroid_android_vs2019.sln "${{ matrix.configuration }}_NoBlob" "arm64_v8a"
-          & $env:COMPILE_BATCH codebase\temp\solutions\HelloAndroid_android_vs2019.sln "${{ matrix.configuration }}_NoBlob" "x86_64"
-
       - name: NetCore/DotNetCoreFrameworkHelloWorld ${{ matrix.configuration }}
         if: runner.os == 'Windows'
         working-directory: 'samples/NetCore/DotNetCoreFrameworkHelloWorld'

diff --git a/Sharpmake.Application/Properties/AssemblyInfo.cs b/Sharpmake.Application/Properties/AssemblyInfo.cs
@@ -43,4 +43,4 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("0.18.0.0")]
+[assembly: AssemblyVersion("0.18.1.0")]
diff --git a/Sharpmake.Generators/FastBuild/MasterBff.cs b/Sharpmake.Generators/FastBuild/MasterBff.cs
@@ -264,7 +264,7 @@ void registerOutputAndCheck(string outputFile)
                 }
                 else if (FileSystemStringComparer.StaticCompare(pair.sourceBff, bffFullPath) != 0 || pair.sourceNodeIdentifier != fastBuildTargetIdentifier)
                 {
-                    throw new Error("Found identical output from multiple sources!");
+                    throw new Error($"Found identical output '{outputFile}' from multiple sources!");
                 }
             }
 

diff --git a/Sharpmake.Generators/Properties/AssemblyInfo.cs b/Sharpmake.Generators/Properties/AssemblyInfo.cs
@@ -44,6 +44,6 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("0.18.0.0")]
+[assembly: AssemblyVersion("0.18.1.0")]
 
 [assembly: InternalsVisibleTo("Sharpmake")]
diff --git a/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Properties/AssemblyInfo.cs b/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Properties/AssemblyInfo.cs
@@ -44,6 +44,6 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("0.18.0.0")]
+[assembly: AssemblyVersion("0.18.1.0")]
 
 [assembly: SharpmakeExtension]
diff --git a/Sharpmake/DebugProjectGenerator.cs b/Sharpmake/DebugProjectGenerator.cs
@@ -302,6 +302,9 @@ public DebugProject()
             NoneExtensions.Clear();
             VsctExtension.Clear();
 
+            // nor removed
+            SourceFilesExcludeRegex.Clear();
+
             Name = _projectInfo.DisplayName;
 
             // Use the new csproj style

diff --git a/Sharpmake/Properties/AssemblyInfo.cs b/Sharpmake/Properties/AssemblyInfo.cs
@@ -44,9 +44,9 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("0.18.0.0")]
+[assembly: AssemblyVersion("0.18.1.0")]
 #pragma warning disable CS7035
-[assembly: AssemblyFileVersion("0.18.0.0 (LocalBuild)")]
+[assembly: AssemblyFileVersion("0.18.1.0 (LocalBuild)")]
 #pragma warning restore
 
 [assembly: InternalsVisibleTo("Sharpmake.Application")]
-Original file line number
+Diff line change
@@ Expand Up / @@ -264,7 +264,7 @@ void registerOutputAndCheck(string outputFile) @@
                     }
                     else if (FileSystemStringComparer.StaticCompare(pair.sourceBff, bffFullPath) != 0 || pair.sourceNodeIdentifier != fastBuildTargetIdentifier)
                     {
-                        throw new Error("Found identical output from multiple sources!");
+                        throw new Error($"Found identical output '{outputFile}' from multiple sources!");
                     }
                 }
@@ Expand Down @@