From bb013763cf08374113de97b8a8634b975061cb9b Mon Sep 17 00:00:00 2001 From: Jaewon-Yun Date: Mon, 1 Jul 2024 15:09:39 +0900 Subject: [PATCH 1/6] Update draft-release.yml --- .github/workflows/draft-release.yml | 59 ++++++++++++++++------------- 1 file changed, 33 insertions(+), 26 deletions(-) diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml index 397c978..579c0b8 100644 --- a/.github/workflows/draft-release.yml +++ b/.github/workflows/draft-release.yml @@ -7,14 +7,12 @@ on: pull_request: # branches: [ "main" ] +env: + CONFIGURATION: Release + PLATFORM: x64 + jobs: - build_and_create_release: - permissions: - contents: write - strategy: - matrix: - configuration: [Release] - platform: [x64] + build: runs-on: windows-latest env: Solution_Name: MemoGenerator.sln @@ -37,33 +35,42 @@ 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: 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: Upload artifact + id: upload-artifact + uses: actions/upload-artifact@v4 + with: + # Name of the artifact to upload. + 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/** + # A file, directory or wildcard pattern that describes what to upload + path: MemoGenerator/bin/${{ env.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 + # - 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: Debug - run: | - dir - dir MemoGenerator\bin\x64\Release + 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: Create release uses: softprops/action-gh-release@v2 with: - files: MemoGenerator/bin/x64/Release/MemoGenerator-${{ github.ref_name }}-${{ matrix.platform }}.zip + files: ${{ steps.download-artifact.outputs.download-path }} draft: true From 9ba4c275c165c31d3172625fccfe8ee12555b261 Mon Sep 17 00:00:00 2001 From: Jaewon-Yun Date: Mon, 1 Jul 2024 15:25:11 +0900 Subject: [PATCH 2/6] Update draft-release.yml --- .github/workflows/draft-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml index 579c0b8..6835219 100644 --- a/.github/workflows/draft-release.yml +++ b/.github/workflows/draft-release.yml @@ -38,7 +38,7 @@ jobs: run: msbuild $env:Solution_Name /t:Restore /p:Configuration=${{ env.CONFIGURATION }} /p:Platform=${{ env.PLATFORM }} - name: Build - run: msbuild $env:Solution_Name /p:Configuration=${{ env.CONFIGURATION }} /p:Platform=${{ env.PLATFORM }} + run: msbuild $env:Solution_Name /p:Configuration=${{ env.CONFIGURATION }} /p:Platform=${{ env.PLATFORM }} /p:ConsoleEncoding=UTF8 - name: Upload artifact id: upload-artifact From a936cb430a3ae9b81f01b7750cfda490e657fc73 Mon Sep 17 00:00:00 2001 From: Jaewon-Yun Date: Mon, 1 Jul 2024 15:41:04 +0900 Subject: [PATCH 3/6] Update draft-release.yml --- .github/workflows/draft-release.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml index 6835219..e219e15 100644 --- a/.github/workflows/draft-release.yml +++ b/.github/workflows/draft-release.yml @@ -23,6 +23,9 @@ jobs: with: fetch-depth: 0 + - name: Debug + run: type MemoGenerator\MainWindow.xaml.cs + # Install the .NET Core workload - name: Install .NET Core uses: actions/setup-dotnet@v4 @@ -38,7 +41,7 @@ jobs: run: msbuild $env:Solution_Name /t:Restore /p:Configuration=${{ env.CONFIGURATION }} /p:Platform=${{ env.PLATFORM }} - name: Build - run: msbuild $env:Solution_Name /p:Configuration=${{ env.CONFIGURATION }} /p:Platform=${{ env.PLATFORM }} /p:ConsoleEncoding=UTF8 + run: msbuild $env:Solution_Name /p:Configuration=${{ env.CONFIGURATION }} /p:Platform=${{ env.PLATFORM }} - name: Upload artifact id: upload-artifact From 776960862d52d7b26a1708aeeec0f4321a08ec3a Mon Sep 17 00:00:00 2001 From: Jaewon Yun Date: Mon, 1 Jul 2024 16:15:53 +0900 Subject: [PATCH 4/6] Change file encoding --- MemoGenerator/MainWindow.xaml.cs | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/MemoGenerator/MainWindow.xaml.cs b/MemoGenerator/MainWindow.xaml.cs index 67339ed..3ee514b 100644 --- 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 { From 79163f81566b13131ca5790179037565c2323af7 Mon Sep 17 00:00:00 2001 From: Jaewon-Yun Date: Mon, 1 Jul 2024 17:29:10 +0900 Subject: [PATCH 5/6] Update draft-release.yml --- .github/workflows/draft-release.yml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml index e219e15..3e1aa41 100644 --- a/.github/workflows/draft-release.yml +++ b/.github/workflows/draft-release.yml @@ -23,9 +23,6 @@ jobs: with: fetch-depth: 0 - - name: Debug - run: type MemoGenerator\MainWindow.xaml.cs - # Install the .NET Core workload - name: Install .NET Core uses: actions/setup-dotnet@v4 @@ -53,11 +50,6 @@ jobs: # A file, directory or wildcard pattern that describes what to upload path: MemoGenerator/bin/${{ env.PLATFORM }}/Release/net6.0-windows10.0.18362.0/** - # - 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 - create_release: needs: build permissions: @@ -72,8 +64,11 @@ jobs: # 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 }} + files: ${{ steps.download-artifact.outputs.download-path }}/MemoGenerator-${{ github.ref_name }}-${{ env.PLATFORM }}.zip draft: true From 188afe1bec9ec8fed34a4ddad4e0673adf59b762 Mon Sep 17 00:00:00 2001 From: Jaewon-Yun Date: Mon, 1 Jul 2024 17:42:09 +0900 Subject: [PATCH 6/6] Update draft-release.yml --- .github/workflows/draft-release.yml | 64 ++++++++++++++++++----------- 1 file changed, 40 insertions(+), 24 deletions(-) diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml index 3e1aa41..1045f35 100644 --- a/.github/workflows/draft-release.yml +++ b/.github/workflows/draft-release.yml @@ -13,6 +13,8 @@ env: jobs: build: + permissions: + contents: write runs-on: windows-latest env: Solution_Name: MemoGenerator.sln @@ -40,35 +42,49 @@ jobs: - name: Build run: msbuild $env:Solution_Name /p:Configuration=${{ env.CONFIGURATION }} /p:Platform=${{ env.PLATFORM }} - - name: Upload artifact - id: upload-artifact - uses: actions/upload-artifact@v4 - with: - # Name of the artifact to upload. - name: MemoGenerator-${{ github.ref_name }}-${{ env.PLATFORM }} - - # A file, directory or wildcard pattern that describes what to upload - path: MemoGenerator/bin/${{ env.PLATFORM }}/Release/net6.0-windows10.0.18362.0/** + - 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 - 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: Upload artifact + # id: upload-artifact + # uses: actions/upload-artifact@v4 + # with: + # # Name of the artifact to upload. + # name: MemoGenerator-${{ github.ref_name }}-${{ env.PLATFORM }} + + # # A file, directory or wildcard pattern that describes what to upload + # path: MemoGenerator/bin/${{ env.PLATFORM }}/Release/net6.0-windows10.0.18362.0/** - name: Debug - run: dir ${{ steps.download-artifact.outputs.download-path }} + run: dir - name: Create release uses: softprops/action-gh-release@v2 with: - files: ${{ steps.download-artifact.outputs.download-path }}/MemoGenerator-${{ github.ref_name }}-${{ env.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