Merge branch 'workflow'

1234-one-two-three-four · Jul 1, 2024 · dce8dc3 · dce8dc3
2 parents 60384af + 188afe1
commit dce8dc3
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 32 deletions.
diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml
@@ -7,14 +7,14 @@ on:
   pull_request:
     # branches: [ "main" ]
 
+env:
+  CONFIGURATION: Release
+  PLATFORM: x64
+
 jobs:
-  build_and_create_release:
+  build:
     permissions:
       contents: write
-    strategy:
-      matrix:
-        configuration: [Release]
-        platform: [x64]
     runs-on: windows-latest
     env:
       Solution_Name: MemoGenerator.sln
@@ -37,33 +37,54 @@ jobs:
 
     # Restore the application to populate the obj folder with RuntimeIdentifiers
     - name: Restore the application
-      run: msbuild $env:Solution_Name /t:Restore /p:Configuration=${{ matrix.configuration }} /p:Platform=${{ matrix.platform }}
+      run: msbuild $env:Solution_Name /t:Restore /p:Configuration=${{ env.CONFIGURATION }} /p:Platform=${{ env.PLATFORM }}
 
     - name: Build
-      run: msbuild $env:Solution_Name /p:Configuration=${{ matrix.configuration }} /p:Platform=${{ matrix.platform }}
+      run: msbuild $env:Solution_Name /p:Configuration=${{ env.CONFIGURATION }} /p:Platform=${{ env.PLATFORM }}
+
+    - name: Archive
+      run: |
+        cd MemoGenerator/bin/${{ env.PLATFORM }}/Release
+        tar -c -f MemoGenerator-${{ github.ref_name }}-${{ env.PLATFORM }}.zip net6.0-windows10.0.18362.0
 
     # - name: Upload artifact
     #   id: upload-artifact
     #   uses: actions/upload-artifact@v4
     #   with:
     #     # Name of the artifact to upload.
-    #     name: MemoGenerator-${{ github.ref_name }}-${{ matrix.platform }}
+    #     name: MemoGenerator-${{ github.ref_name }}-${{ env.PLATFORM }}
 
     #     # A file, directory or wildcard pattern that describes what to upload
-    #     path: MemoGenerator/bin/${{ matrix.platform }}/Release/net6.0-windows10.0.18362.0/**
-
-    - name: Archive
-      run: |
-        cd MemoGenerator/bin/x64/Release
-        tar -c -f MemoGenerator-${{ github.ref_name }}-${{ matrix.platform }}.zip net6.0-windows10.0.18362.0
+    #     path: MemoGenerator/bin/${{ env.PLATFORM }}/Release/net6.0-windows10.0.18362.0/**
 
     - name: Debug
-      run: |
-        dir
-        dir MemoGenerator\bin\x64\Release
+      run: dir
 
     - name: Create release
       uses: softprops/action-gh-release@v2
       with:
-        files: MemoGenerator/bin/x64/Release/MemoGenerator-${{ github.ref_name }}-${{ matrix.platform }}.zip
+        files: MemoGenerator/bin/${{ env.PLATFORM }}/Release/MemoGenerator-${{ github.ref_name }}-${{ env.PLATFORM }}.zip
         draft: true
+
+  # create_release:
+  #   needs: build
+  #   permissions:
+  #     contents: write
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #   - uses: actions/download-artifact@v4
+  #     id: download-artifact
+  #     with:
+  #       # Name of the artifact to download.
+  #       # If unspecified, all artifacts for the run are downloaded.
+  #       # Optional.
+  #       name: MemoGenerator-${{ github.ref_name }}-${{ env.PLATFORM }}
+
+  #   - name: Debug
+  #     run: dir ${{ steps.download-artifact.outputs.download-path }}
+
+  #   - name: Create release
+  #     uses: softprops/action-gh-release@v2
+  #     with:
+  #       files: ${{ steps.download-artifact.outputs.download-path }}/MemoGenerator-${{ github.ref_name }}-${{ env.PLATFORM }}.zip
+  #       draft: true
diff --git a/MemoGenerator/MainWindow.xaml.cs b/MemoGenerator/MainWindow.xaml.cs
@@ -32,14 +32,14 @@ public MainWindow()
             invoiceDateErrorTextBox.Visibility = Visibility.Collapsed;
 
             var appWindow = WindowUtil.GetAppWindow(this);
-            appWindow.Title = "일이삼사";
+            appWindow.Title = "일이삼사";
             WindowUtil.CenterToScreen(this);
-            appWindow.Resize(new SizeInt32 { Width = 900, Height = 450 }); // 창 크기
+            appWindow.Resize(new SizeInt32 { Width = 900, Height = 450 }); // 창 크기
             ((OverlappedPresenter)appWindow.Presenter).IsAlwaysOnTop = false;
-            ((OverlappedPresenter)appWindow.Presenter).IsMaximizable = false; // 최대화 가능 여부
+            ((OverlappedPresenter)appWindow.Presenter).IsMaximizable = false; // 최대화 가능 여부
             ((OverlappedPresenter)appWindow.Presenter).IsResizable = false;
-            //((OverlappedPresenter)appWindow.Presenter).Maximize(); // 실행 시 창이 최대화 상태로 나타남
-            appWindow.SetPresenter(AppWindowPresenterKind.Default); // 화면 형태 설정
+            //((OverlappedPresenter)appWindow.Presenter).Maximize(); // 실행 시 창이 최대화 상태로 나타남
+            appWindow.SetPresenter(AppWindowPresenterKind.Default); // 화면 형태 설정
 
             this.AppWindow.SetIcon("C:\\Users\\y\\Desktop\\Visual Studio\\Projects\\MemoGenerator\\MemoGenerator\\Assets\\app-icon.ico");
         }
@@ -93,15 +93,15 @@ private void updateIdentifyingComponent(object sender, TextChangedEventArgs e)
 
         private void updatePaymentProofMethodComponent(object sender, RoutedEventArgs e)
         {
-            // 함께사는 세상 옵션 추가
-            // 분할 발행 기능
+            // 함께사는 세상 옵션 추가
+            // 분할 발행 기능
 
             string companyName = "";
             invoiceDateErrorTextBox.Visibility = Visibility.Collapsed;
 
             if (companyCheckBox.IsChecked == true)
             {
-                companyName = " 대미";
+                companyName = " 대미";
             }
 
             var invoiceDate = "";
@@ -116,15 +116,15 @@ private void updatePaymentProofMethodComponent(object sender, RoutedEventArgs e)
 
             if (taxInvoiceCheckBox.IsChecked == true && transactionStatementCheckBox.IsChecked == true)
             {
-                paymentProofMethodComponent = "-[" + invoiceDate + " 자" + companyName + " 계산서/명세서 발행]";
+                paymentProofMethodComponent = "-[" + invoiceDate + " 자" + companyName + " 계산서/명세서 발행]";
             }
             else if (taxInvoiceCheckBox.IsChecked == true)
             {
-                paymentProofMethodComponent = "-[" + invoiceDate + " 자" + companyName + " 계산서 발행]";
+                paymentProofMethodComponent = "-[" + invoiceDate + " 자" + companyName + " 계산서 발행]";
             }
             else if (transactionStatementCheckBox.IsChecked == true)
             {
-                paymentProofMethodComponent = "-[" + invoiceDate + " 자" + companyName + " 명세서 발행]";
+                paymentProofMethodComponent = "-[" + invoiceDate + " 자" + companyName + " 명세서 발행]";
             }
             else
             {
@@ -137,15 +137,15 @@ private void updateDocumentsDeliveryRouteComponent(object sender, RoutedEventArg
         {
             if (sendingEmailCheckBox.IsChecked == true && sendingRegisteredCheckBox.IsChecked == true)
             {
-                documentsDeliveryRouteComponent = "-[서류(*) 메일/등기 발송]";
+                documentsDeliveryRouteComponent = "-[서류(*) 메일/등기 발송]";
             }
             else if (sendingEmailCheckBox.IsChecked == true)
             {
-                documentsDeliveryRouteComponent = "-[서류(*) 메일 발송]";
+                documentsDeliveryRouteComponent = "-[서류(*) 메일 발송]";
             }
             else if (sendingRegisteredCheckBox.IsChecked == true)
             {
-                documentsDeliveryRouteComponent = "-[서류(*) 등기 발송]";
+                documentsDeliveryRouteComponent = "-[서류(*) 등기 발송]";
             }
             else
             {