WIP

sql-bi · Dec 10, 2024 · bd5395e · bd5395e
1 parent 43e6ce0
commit bd5395e
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 28 deletions.
diff --git a/.azure/pipelines/build-bravo.yaml b/.azure/pipelines/build-bravo.yaml
@@ -13,27 +13,27 @@ trigger: none
 
 strategy:
   matrix:
-    bravo-selfcontained-net6:
-      arch: 'x64'
-      framework: 'net6.0'
-      selfcontained: 'true'
-      publishmode: 'SELFCONTAINED'
-      artifact: 'Bravo.$(AppVersionMajor).$(AppVersionMinor).$(AppVersionPatch).x64'
-      artifactsuffix: ''
-    bravo-selfcontained-net8:
-      arch: 'x64'
-      framework: 'net8.0'
-      selfcontained: 'true'
-      publishmode: 'SELFCONTAINED'
-      artifact: 'Bravo.$(AppVersionMajor).$(AppVersionMinor).$(AppVersionPatch).x64'
-      artifactsuffix: '-net8'
-    bravo-frameworkdependent-net6:
-      arch: 'x64'
-      framework: 'net6.0'
-      selfcontained: 'false'
-      publishmode: 'FRAMEWORKDEPENDENT'
-      artifact: 'Bravo.$(AppVersionMajor).$(AppVersionMinor).$(AppVersionPatch).x64-frameworkdependent'
-      artifactsuffix: ''
+    # bravo-selfcontained-net6:
+    #   arch: 'x64'
+    #   framework: 'net6.0'
+    #   selfcontained: 'true'
+    #   publishmode: 'SELFCONTAINED'
+    #   artifact: 'Bravo.$(AppVersionMajor).$(AppVersionMinor).$(AppVersionPatch).x64'
+    #   artifactsuffix: ''
+    # bravo-selfcontained-net8:
+    #   arch: 'x64'
+    #   framework: 'net8.0'
+    #   selfcontained: 'true'
+    #   publishmode: 'SELFCONTAINED'
+    #   artifact: 'Bravo.$(AppVersionMajor).$(AppVersionMinor).$(AppVersionPatch).x64'
+    #   artifactsuffix: '-net8'
+    # bravo-frameworkdependent-net6:
+    #   arch: 'x64'
+    #   framework: 'net6.0'
+    #   selfcontained: 'false'
+    #   publishmode: 'FRAMEWORKDEPENDENT'
+    #   artifact: 'Bravo.$(AppVersionMajor).$(AppVersionMinor).$(AppVersionPatch).x64-frameworkdependent'
+    #   artifactsuffix: ''
     bravo-frameworkdependent-net8:
       arch: 'x64'
       framework: 'net8.0'
@@ -76,19 +76,23 @@ steps:
   env:
     SYSTEM_ACCESSTOKEN: $(System.AccessToken)
 - task: Assembly-Info-NetCore@3
+  name: ai
   displayName: 'Update AssemblyInfo'
   inputs:
     Path: '$(Build.SourcesDirectory)'
     FileNames: 'src\Bravo.csproj'
     InsertAttributes: true
     FileEncoding: 'auto'
-    WriteBOM: false
-    VersionNumber: '$(AppVersionNumber)'
-    InformationalVersion: '$(AppVersionInformationalVersion)'
-    UpdateBuildNumber: '$(AppBuildNumber)-$(AppVersionNumber)'
+    WriteBOM: true
+    VersionNumber: '#.#.#.$(Build.BuildId)'
+    # VersionNumber: '$(AppVersionNumber)'
+    # InformationalVersion: '$(AppVersionInformationalVersion)'
+    # UpdateBuildNumber: '$(AppBuildNumber)-$(AppVersionNumber)'
     LogLevel: 'verbose'
     FailOnWarning: true
     DisableTelemetry: true
+- script: Write-Host "##vso[build.updatebuildnumber]$(ai.AssemblyInfo.Version)"
+  displayName: 'Update Build Number'
 - script: dotnet --info
   displayName: dotnet info
 - task: UseDotNet@2

diff --git a/src/Bravo.csproj b/src/Bravo.csproj
@@ -15,7 +15,6 @@
     <ApplicationHighDpiMode>PerMonitorV2</ApplicationHighDpiMode>
     <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
     <IncludeOpenAPIAnalyzers>true</IncludeOpenAPIAnalyzers>
-    <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
     <SatelliteResourceLanguages>en-US</SatelliteResourceLanguages>
   </PropertyGroup>
 

diff --git a/src/Properties/AssemblyInfo.cs b/src/Properties/AssemblyInfo.cs
@@ -11,8 +11,8 @@
 [assembly: AssemblyCopyright("© SQLBI Corporation")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("0.0.0.999")]
-[assembly: AssemblyInformationalVersion("0.0.0.999-DEV")]
+[assembly: AssemblyVersion("1.0.9")]
+//[assembly: AssemblyInformationalVersion("1.0.10")]
 #if DEBUG
 [assembly: AssemblyConfiguration("Debug")]
 #else