Merge pull request #2 from OpenCommissioning/development

Development

Author: mika-engineering

.github/workflows/release.yml

@@ -6,7 +6,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: windows-latest
 
     steps:
     - name: Checkout
@@ -34,11 +34,17 @@ jobs:
 
     - name: Get current version
       if: steps.versionize.outcome == 'success'
-      run: echo "VERSION=v$(versionize inspect)" >> $GITHUB_ENV
+      run: |
+        $version = versionize inspect
+        echo "VERSION=v$version" >> $env:GITHUB_ENV
+      shell: pwsh
 
     - name: Get current changelog
       if: steps.versionize.outcome == 'success'
-      run: echo "$(versionize changelog)" > latest_changelog.md
+      run: |
+        $changelog = versionize changelog
+        Set-Content -Path latest_changelog.md -Value $changelog
+      shell: pwsh
 
     - name: Push changes to GitHub
       if: steps.versionize.outcome == 'success'
@@ -53,20 +59,40 @@ jobs:
       run: |
         dotnet build OC.OfficeLite --configuration release --output ./Publish
         dotnet build OC.OfficeLiteServer --configuration release --output ./Publish
+        
+    - name: Install AzureSignTool
+      run: dotnet tool install --global azuresigntool
+
+    - name: Sign executable
+      if: steps.versionize.outcome == 'success'
+      run: |
+        azuresigntool sign `
+          -kvu ${{secrets.AZURE_KEY_VAULT}} `
+          -kvc ${{secrets.AZURE_CERT_NAME}} `
+          -kvt ${{secrets.AZURE_TENANT_ID}} `
+          -kvi ${{secrets.AZURE_CLIENT_ID}} `
+          -kvs ${{secrets.AZURE_CLIENT_SECRET}} `
+          -tr http://timestamp.globalsign.com/tsa/advanced `
+          -td sha256 `
+          ./Publish/OC.OfficeLite.dll `
+          ./Publish/OC.OfficeLiteServer.exe
+        
+    - name: Zip signed artifacts
+      if: steps.versionize.outcome == 'success'
+      run: |
+        mkdir OC.OfficeLite
+        mv OC.OfficeLite.dll OC.OfficeLite/
+        mv Config.plugin OC.OfficeLite/
+        Compress-Archive -Path OC.OfficeLite -DestinationPath OC.OfficeLite_${{env.VERSION}}.zip
+        Compress-Archive -Path OC.OfficeLiteServer.exe -DestinationPath OC.OfficeLiteServer_${{env.VERSION}}.zip
+      shell: pwsh
+      working-directory: Publish
 
     - name: Publish new release
       if: steps.versionize.outcome == 'success'
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
         gh release create ${{env.VERSION}} -t "Release ${{env.VERSION}}" -F latest_changelog.md
-        cd ./Publish
-        mkdir OC.OfficeLite
-        mv OC.OfficeLite.dll OC.OfficeLite/
-        mv Config.plugin OC.OfficeLite/
-        zip -r OC.OfficeLite_${{env.VERSION}}.zip OC.OfficeLite
-        gh release upload ${{env.VERSION}} OC.OfficeLite_${{env.VERSION}}.zip
-        mkdir OC.OfficeLiteServer
-        mv OC.OfficeLiteServer.exe OC.OfficeLiteServer/
-        zip -r OC.OfficeLiteServer_${{env.VERSION}}.zip OC.OfficeLiteServer
-        gh release upload ${{env.VERSION}} OC.OfficeLiteServer_${{env.VERSION}}.zip
+        gh release upload ${{env.VERSION}} ./Publish/OC.OfficeLite_${{env.VERSION}}.zip
+        gh release upload ${{env.VERSION}} ./Publish/OC.OfficeLiteServer_${{env.VERSION}}.zip

OC.OfficeLite/OC.OfficeLite.csproj

@@ -15,7 +15,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="OC.Assistant.Sdk" Version="1.6.1" />
+      <PackageReference Include="OC.Assistant.Sdk" Version="1.7.1" />
     </ItemGroup>
 
     <ItemGroup>

OC.OfficeLiteServer/MainWindow.xaml

@@ -15,13 +15,16 @@
     <theme:Window.TitleBarContent>
         <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
             <Button 
-                FontFamily="{DynamicResource SymbolThemeFontFamily}"
                 FontSize="14"
                 ToolTip="Settings"
-                Content="&#xE712;" 
-                Click="SettingsOnClick"/>
+                Click="SettingsOnClick">
+                <ContentControl
+                    Margin="0 -3 2 3"
+                    Template="{DynamicResource IconTemplate}"
+                    Content="{DynamicResource IconMore}"/>
+            </Button>
             <Border Width="1" Background="{DynamicResource White4Brush}" Margin="6 8 0 8"/>
         </StackPanel>
     </theme:Window.TitleBarContent>
-    <theme:LogViewer x:Name="LogViewer" Background="Transparent"/>
+    <theme:LogViewer x:Name="LogViewer"/>
 </theme:Window>

OC.OfficeLiteServer/MainWindow.xaml.cs

@@ -33,7 +33,8 @@ private async void SettingsOnClick(object sender, RoutedEventArgs e)
         try
         {
             var settings = new SettingsView();
-            var result = await Modal.Show("Settings", settings, MessageBoxButton.OKCancel, MessageBoxImage.None);
+            var result = await Assistant.Theme.MessageBox
+                .Show("Settings", settings, MessageBoxButton.OKCancel, MessageBoxImage.None);
             if (result != MessageBoxResult.OK || !settings.Apply()) return;
 
             Logger.LogInfo(this, "Restarting server...");

OC.OfficeLiteServer/OC.OfficeLiteServer.csproj

@@ -29,7 +29,7 @@
         <PrivateAssets>all</PrivateAssets>
       </PackageReference>
       <PackageReference Include="OC.Assistant.Sdk" Version="1.7.1" />
-      <PackageReference Include="OC.Assistant.Theme" Version="2.0.1" />
+      <PackageReference Include="OC.Assistant.Theme" Version="2.1.0" />
       <PackageReference Include="System.Text.Json" Version="9.0.5" />
     </ItemGroup>