From f97e74473c98348c8c8f291e9d24b3a2f10dd946 Mon Sep 17 00:00:00 2001 From: marcgiannandrea3s Date: Tue, 23 Jul 2024 09:05:53 +0200 Subject: [PATCH 1/8] Removed packages.config --- packages.config | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 packages.config diff --git a/packages.config b/packages.config deleted file mode 100644 index 1f3c7676..00000000 --- a/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - From 23deb982b6e252226597354659e76ae7ac1ac90a Mon Sep 17 00:00:00 2001 From: marcgiannandrea3s Date: Tue, 23 Jul 2024 11:48:54 +0200 Subject: [PATCH 2/8] Updated README.MD --- readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/readme.md b/readme.md index 81fe2e31..99d3035a 100644 --- a/readme.md +++ b/readme.md @@ -40,5 +40,5 @@ If you want to donate to my efforts on this project, please use the following li /Master - Not to be changed in 3Shape - should be kept in sync with the fork origin. - -Build link: https://jenkins.3shape.local/job/obfuscar/ +Build Link: https://github.com/3shape/obfuscar/actions +Release link: https://github.com/3ShapeInternal/ThreeShape.Obfuscar.Release From b586a80a3dfa1b394da93103908cd997f56444d9 Mon Sep 17 00:00:00 2001 From: marcgiannandrea3s Date: Tue, 23 Jul 2024 11:50:01 +0200 Subject: [PATCH 3/8] Added simple PR build process --- .github/workflows/build-nuget-package.yml | 65 +++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 .github/workflows/build-nuget-package.yml diff --git a/.github/workflows/build-nuget-package.yml b/.github/workflows/build-nuget-package.yml new file mode 100644 index 00000000..071beb3f --- /dev/null +++ b/.github/workflows/build-nuget-package.yml @@ -0,0 +1,65 @@ +name: Build & Test Obfuscar + +on: + pull_request: + branches: + - master + - ThreeShape.Obfuscar + - 3shape + +env: + ProjectFolder: 'Obfuscar' + SolutionFile: 'Obfuscar.sln' + VsTestExecutable: 'C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\Common7\IDE\CommonExtensions\Microsoft\TestWindow\vstest.console.exe' + NugetPackOutputDir: 'nuget-pack-out' + configuration: 'Release' + +jobs: + build-project: + runs-on: windows-2022 + timeout-minutes: 10 + steps: + + - name: Dotnet info + run: dotnet --info + + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + submodules: 'recursive' + + - name: Setup NuGet.exe + uses: nuget/setup-nuget@v2 + + + - name: Nuget restore project + shell: pwsh + run: | + nuget restore ${{ env.SolutionFile }} + + - name: Add msbuild to PATH + uses: microsoft/setup-msbuild@v2 + + - name: Build project + shell: pwsh + run: | + msbuild ${{ env.SolutionFile }} -p:Configuration=${{ env.configuration }} ` + -m:1 ` + -nr:false + + - name: Run unit tests + shell: pwsh + run: | + $testFiles = Get-ChildItem -Path . -Filter "*test.dll" -Recurse | ForEach-Object { $_.FullName } + foreach ($testFile in $testFiles) { + dotnet test $testFile --logger trx + } + + - name: Publish test results + uses: phoenix-actions/test-reporting@v15 + with: + name: 'VsTest report results' + path: '**/*.trx' + reporter: 'dotnet-trx' + output-to: 'step-summary' From 07a7e128664e0d4eaa7c404fd365b7396eff2b28 Mon Sep 17 00:00:00 2001 From: marcgiannandrea3s Date: Tue, 23 Jul 2024 12:28:07 +0200 Subject: [PATCH 4/8] Removed unused VsTestExecutable --- .github/workflows/build-nuget-package.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build-nuget-package.yml b/.github/workflows/build-nuget-package.yml index 071beb3f..d24fd67a 100644 --- a/.github/workflows/build-nuget-package.yml +++ b/.github/workflows/build-nuget-package.yml @@ -10,7 +10,6 @@ on: env: ProjectFolder: 'Obfuscar' SolutionFile: 'Obfuscar.sln' - VsTestExecutable: 'C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\Common7\IDE\CommonExtensions\Microsoft\TestWindow\vstest.console.exe' NugetPackOutputDir: 'nuget-pack-out' configuration: 'Release' From 3bb97aceb4e026db625746f1e864d157c16bab76 Mon Sep 17 00:00:00 2001 From: Marc Giannandrea <109946776+marcgiannandrea3s@users.noreply.github.com> Date: Fri, 16 Aug 2024 12:41:32 +0200 Subject: [PATCH 5/8] Formatting Workflow --- .github/workflows/build-nuget-package.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build-nuget-package.yml b/.github/workflows/build-nuget-package.yml index d24fd67a..c28f121f 100644 --- a/.github/workflows/build-nuget-package.yml +++ b/.github/workflows/build-nuget-package.yml @@ -18,7 +18,6 @@ jobs: runs-on: windows-2022 timeout-minutes: 10 steps: - - name: Dotnet info run: dotnet --info @@ -31,7 +30,6 @@ jobs: - name: Setup NuGet.exe uses: nuget/setup-nuget@v2 - - name: Nuget restore project shell: pwsh run: | From 00f6c098e5355363f7a818443f4a9a00d12df1e2 Mon Sep 17 00:00:00 2001 From: marcgiannandrea3s Date: Tue, 20 Aug 2024 09:14:06 +0200 Subject: [PATCH 6/8] Updated csproj isLocalRun to support GHA --- Console/Obfuscar.Console.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Console/Obfuscar.Console.csproj b/Console/Obfuscar.Console.csproj index c7b83db3..82fa2876 100644 --- a/Console/Obfuscar.Console.csproj +++ b/Console/Obfuscar.Console.csproj @@ -1,9 +1,9 @@  - + true - $(TrueValue) + $(TrueValue) From 9e1ba84a4dc5877980a90df2fe7e62b83a00cd42 Mon Sep 17 00:00:00 2001 From: marcgiannandrea3s Date: Tue, 20 Aug 2024 09:31:13 +0200 Subject: [PATCH 7/8] Removed signing logic, as we removed the Obfuscar package --- Console/Obfuscar.Console.csproj | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/Console/Obfuscar.Console.csproj b/Console/Obfuscar.Console.csproj index 82fa2876..b3c4c741 100644 --- a/Console/Obfuscar.Console.csproj +++ b/Console/Obfuscar.Console.csproj @@ -1,16 +1,5 @@  - - - true - $(TrueValue) - - - - - - - From 67f261a8b2618e08d56456d711ce8a66ccee7db6 Mon Sep 17 00:00:00 2001 From: marcgiannandrea3s Date: Wed, 21 Aug 2024 11:38:00 +0200 Subject: [PATCH 8/8] GenerateAssemblyInfo to false based on release process --- Obfuscar/Obfuscar.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/Obfuscar/Obfuscar.csproj b/Obfuscar/Obfuscar.csproj index 2b9adc49..c858725f 100644 --- a/Obfuscar/Obfuscar.csproj +++ b/Obfuscar/Obfuscar.csproj @@ -2,6 +2,7 @@ net60-windows;net48 + false