From c9df26a720c02c3162bb3eab6ab0bee5d64d357e Mon Sep 17 00:00:00 2001 From: Jonathan Dick Date: Thu, 12 Mar 2020 12:38:08 -0400 Subject: [PATCH 1/4] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 94ce11f04..773bd4036 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,7 +10,7 @@ jobs: name: Build env: NUPKG_MAJOR: 3.0 - runs-on: macos-latest + runs-on: windows-latest steps: - name: Checkout uses: actions/checkout@v2 From 79ab6bd3cb2924a0a97abad4dfef6e6fcd5336e9 Mon Sep 17 00:00:00 2001 From: Jonathan Dick Date: Thu, 12 Mar 2020 12:53:28 -0400 Subject: [PATCH 2/4] Update build.yml --- .github/workflows/build.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 773bd4036..aeb1e58bf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,25 +15,25 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Define CI Version - run: echo ::set-env name=NUPKG_VER::$NUPKG_MAJOR-pre$GITHUB_RUN_ID + run: $env:NUPKG_VER = ($env:NUPKG_MAJOR + "-" + $env:GITHUB_RUN_ID) - name: Define Release Version if: github.event_name == 'release' - run: echo ::set-env name=NUPKG_VER::${GITHUB_REF/refs\/tags\//} + run: $env:NUPKG_VER = $env:GITHUB_REF.Substring($env:GITHUB_REF.LastIndexOf('/') + 1) - name: Setup Environment - run: mkdir ./artifacts + run: New-Item -ItemType Directory -Force -Path .\artifacts - name: NuGet Restore ZXing.Net.Mobile - run: msbuild /t:Restore /p:Configuration=Release ./ZXing.Net.Mobile.sln + run: msbuild /t:Restore /p:Configuration=Release .\ZXing.Net.Mobile.sln - name: Build ZXing.Net.Mobile - run: msbuild /t:Build /p:Configuration=Release ./ZXing.Net.Mobile.sln + run: msbuild /t:Build /p:Configuration=Release .\ZXing.Net.Mobile.sln - name: NuGet Pack ZXing.Net.Mobile - run: msbuild /t:Pack /p:Configuration=Release /p:PackageOutputPath=../artifacts /p:PackageVersion=$NUPKG_VER /p:IncludeSymbols=true /p:SymbolPackageFormat=snupkg ./ZXing.Net.Mobile/ZXing.Net.Mobile.csproj + run: msbuild /t:Pack /p:Configuration=Release /p:PackageOutputPath=..\artifacts /p:PackageVersion=$NUPKG_VER /p:IncludeSymbols=true /p:SymbolPackageFormat=snupkg .\ZXing.Net.Mobile\ZXing.Net.Mobile.csproj - name: NuGet Pack ZXing.Net.Mobile.Forms - run: msbuild /t:Pack /p:Configuration=Release /p:PackageOutputPath=../artifacts /p:PackageVersion=$NUPKG_VER /p:IncludeSymbols=true /p:SymbolPackageFormat=snupkg ./ZXing.Net.Mobile.Forms/ZXing.Net.Mobile.Forms.csproj + run: msbuild /t:Pack /p:Configuration=Release /p:PackageOutputPath=..\artifacts /p:PackageVersion=$NUPKG_VER /p:IncludeSymbols=true /p:SymbolPackageFormat=snupkg .\ZXing.Net.Mobile.Forms\ZXing.Net.Mobile.Forms.csproj - name: Upload Artifacts uses: actions/upload-artifact@v1 with: name: NuGet - path: ./artifacts + path: .\artifacts publish-gh: name: Publish to GitHub Packages From 144ac1be431b86dc554867255dfb8e778cfb0740 Mon Sep 17 00:00:00 2001 From: Jonathan Dick Date: Thu, 12 Mar 2020 12:56:13 -0400 Subject: [PATCH 3/4] Update build.yml --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index aeb1e58bf..829a2e8c2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,6 +14,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 + - name: Setup MSBuild + uses: microsoft/setup-msbuild@v1.0.0 - name: Define CI Version run: $env:NUPKG_VER = ($env:NUPKG_MAJOR + "-" + $env:GITHUB_RUN_ID) - name: Define Release Version From 9506a7b1c206ad5582bde8e30cec8f3e9c22795d Mon Sep 17 00:00:00 2001 From: Jonathan Dick Date: Thu, 12 Mar 2020 13:19:48 -0400 Subject: [PATCH 4/4] Update build.yml --- .github/workflows/build.yml | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 829a2e8c2..e8a7241b9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,21 +16,19 @@ jobs: uses: actions/checkout@v2 - name: Setup MSBuild uses: microsoft/setup-msbuild@v1.0.0 - - name: Define CI Version - run: $env:NUPKG_VER = ($env:NUPKG_MAJOR + "-" + $env:GITHUB_RUN_ID) - - name: Define Release Version - if: github.event_name == 'release' - run: $env:NUPKG_VER = $env:GITHUB_REF.Substring($env:GITHUB_REF.LastIndexOf('/') + 1) - - name: Setup Environment - run: New-Item -ItemType Directory -Force -Path .\artifacts - - name: NuGet Restore ZXing.Net.Mobile + - name: NuGet Restore run: msbuild /t:Restore /p:Configuration=Release .\ZXing.Net.Mobile.sln - - name: Build ZXing.Net.Mobile + - name: Build run: msbuild /t:Build /p:Configuration=Release .\ZXing.Net.Mobile.sln - - name: NuGet Pack ZXing.Net.Mobile - run: msbuild /t:Pack /p:Configuration=Release /p:PackageOutputPath=..\artifacts /p:PackageVersion=$NUPKG_VER /p:IncludeSymbols=true /p:SymbolPackageFormat=snupkg .\ZXing.Net.Mobile\ZXing.Net.Mobile.csproj - - name: NuGet Pack ZXing.Net.Mobile.Forms - run: msbuild /t:Pack /p:Configuration=Release /p:PackageOutputPath=..\artifacts /p:PackageVersion=$NUPKG_VER /p:IncludeSymbols=true /p:SymbolPackageFormat=snupkg .\ZXing.Net.Mobile.Forms\ZXing.Net.Mobile.Forms.csproj + - name: Package NuGets + run: | + $pkgVer = ($env:NUPKG_MAJOR + "-alpha" + $env:GITHUB_RUN_ID) + if ($env:GITHUB_EVENT_NAME -eq "release") { + $pkgVer = $env:GITHUB_REF.Substring($env:GITHUB_REF.LastIndexOf('/') + 1) + } + New-Item -ItemType Directory -Force -Path .\artifacts + msbuild /t:Pack /p:Configuration=Release /p:PackageOutputPath=..\artifacts /p:PackageVersion=$pkgVer /p:IncludeSymbols=true /p:SymbolPackageFormat=snupkg .\ZXing.Net.Mobile\ZXing.Net.Mobile.csproj + msbuild /t:Pack /p:Configuration=Release /p:PackageOutputPath=..\artifacts /p:PackageVersion=$pkgVer /p:IncludeSymbols=true /p:SymbolPackageFormat=snupkg .\ZXing.Net.Mobile.Forms\ZXing.Net.Mobile.Forms.csproj - name: Upload Artifacts uses: actions/upload-artifact@v1 with: