Fix versioning

BaldrAI · Aug 6, 2024 · 363d393 · 363d393
1 parent a7d4454
commit 363d393
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/macos-build.yml b/.github/workflows/macos-build.yml
@@ -39,7 +39,7 @@ jobs:
         dotnet workload install maui --ignore-failed-sources
 
     - name: Build MAUI MacCatalyst
-      run: dotnet publish /p:Version=$VERSION ${{ env.CS_Project_Path }} -c Release -f net8.0-maccatalyst -p:BuildIpa=True
+      run: dotnet publish /p:Version=$(version) /p:ApplicationDisplayVersion=$(version) /p:ApplicationVersion=$(version) ${{ env.CS_Project_Path }} -c Release -f net8.0-maccatalyst -p:BuildIpa=True
 
     - name: Upload MacCatalyst Artifact
       uses: actions/upload-artifact@v2.3.1

diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml
@@ -43,7 +43,7 @@ jobs:
       run: dotnet workload install maui
 
     - name: Build the application
-      run: dotnet publish /p:Version=$VERSION -f net8.0-windows10.0.22621.0 -c Release -p:WindowsPackageType=None -p:PublishSingleFile=true -o ${{ env.CS_Project_Directory }}\AppPackages --self-contained
+      run: dotnet publish /p:Version=$VERSION /p:ApplicationDisplayVersion=$VERSION /p:ApplicationVersion=$VERSION -f net8.0-windows10.0.22621.0 -c Release -p:WindowsPackageType=None -p:PublishSingleFile=true -o ${{ env.CS_Project_Directory }}\AppPackages --self-contained
 
     - name: Upload build artifacts
       uses: actions/upload-artifact@v3

diff --git a/OpenOTDR/OpenOTDR-MacIOS.csproj b/OpenOTDR/OpenOTDR-MacIOS.csproj
@@ -17,7 +17,7 @@
 		<ApplicationId>com.baldrai.openotdr</ApplicationId>
 
 		<!-- Versions -->
-		<ApplicationDisplayVersion>1.0-alpha</ApplicationDisplayVersion>
+		<ApplicationDisplayVersion>1.0.0</ApplicationDisplayVersion>
 		<ApplicationVersion>1</ApplicationVersion>
 
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">16.1</SupportedOSPlatformVersion>

diff --git a/OpenOTDR/OpenOTDR.csproj b/OpenOTDR/OpenOTDR.csproj
@@ -25,7 +25,7 @@
 		<ApplicationId>com.baldrai.openotdr</ApplicationId>
 
 		<!-- Versions -->
-		<ApplicationDisplayVersion>1.0-alpha</ApplicationDisplayVersion>
+		<ApplicationDisplayVersion>1.0.0</ApplicationDisplayVersion>
 		<ApplicationVersion>1</ApplicationVersion>
 
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.22621.0</SupportedOSPlatformVersion>