fix: updted workflow yamls and nuspec to resolve build action failure…

…s after migration to new org

.github/workflows/essentialsplugins-betabuilds.yml → .github/workflows/essentialsplugins-betabuilds-v2.yml

@@ -18,8 +18,6 @@ env:
 jobs:
   Build_Project:
     runs-on: windows-2019
-    outputs:
-      version: ${{steps.setVersionNumber.outputs.version}}
     steps:
       # First we checkout the source repo
       - name: Checkout repo
@@ -31,7 +29,6 @@ jobs:
         run: git fetch --tags
       # Generate the appropriate version number
       - name: Set Version Number
-        id: setVersionNumber
         shell: powershell
         run: |
           $latestVersions = $(git tag --merged origin/main)
@@ -49,7 +46,6 @@ jobs:
               continue;
             }
           }
-
           $newVersion = [version]$latestVersion
           $phase = ""
           $newVersionString = ""
@@ -77,7 +73,6 @@ jobs:
             }
           }      
           echo "VERSION=$newVersionString" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-          echo "::set-output name=version::$newVersionString"
       # Use the version number to set the version of the assemblies
       - name: Update AssemblyInfo.cs
         shell: powershell
@@ -90,7 +85,6 @@ jobs:
           Write-Output "AssemblyVersion = $NewAssemblyVersion"
           $NewAssemblyInformationalVersion = 'AssemblyInformationalVersion("' + $Version + '")'
           Write-Output "AssemblyInformationalVersion = $NewAssemblyInformationalVersion"
-
           foreach ($o in $input) {
               Write-output $o.FullName
               $TmpFile = $o.FullName + ".tmp"
@@ -103,13 +97,11 @@ jobs:
               move-item $TmpFile $o.FullName -force
             }
           }
-
           function Update-AllAssemblyInfoFiles ( $version ) {
               foreach ($file in "AssemblyInfo.cs", "AssemblyInfo.vb" ) {
                   get-childitem -Path $Env:GITHUB_WORKSPACE -recurse | Where-Object { $_.Name -eq $file } | Update-SourceVersion $version ;
               }
           }
-
           # validate arguments
           $r = [System.Text.RegularExpressions.Regex]::Match($Env:VERSION, "\d+\.\d+\.\d+.*");
           if ($r.Success) {
@@ -122,12 +114,10 @@ jobs:
               Write-Output " ";
               Write-Output "Unable to apply version to AssemblyInfo.cs files";
           }
-      - name: add PepperDash Eng Feed 
-        run: nuget sources add -name github -source https://nuget.pkg.github.com/pepperdash-engineering/index.json -username ${{ secrets.GH_PACKAGE_USER }} -password ${{ secrets.GH_PACKAGE_PASSWORD  }}
       - name: restore Nuget Packages
         run: nuget install .\packages.config -OutputDirectory .\packages -ExcludeVersion
       # Set the SOLUTION_PATH
-      - name: Get SLN Path
+      - name: Get SLN Path 
         shell: powershell
         run: |
           $solution_path = Get-ChildItem *.sln -recurse 
@@ -136,7 +126,7 @@ jobs:
           Write-Output $solution_path
           echo "SOLUTION_PATH=$($solution_path)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
         # Set the SOLUTION_FILE
-      - name: Get SLN File
+      - name: Get SLN File 
         shell: powershell
         run: |
           $solution_file = Get-ChildItem .\*.sln -recurse -Path "$($Env:GITHUB_WORKSPACE)" 
@@ -150,7 +140,7 @@ jobs:
       # Build the solutions in the docker image
       - name: Build Solution
         shell: powershell
-        run: |
+        run: | 
           Invoke-Expression "docker run --rm --mount type=bind,source=""$($Env:GITHUB_WORKSPACE)"",target=""c:/project"" pepperdash/sspbuilder c:\cihelpers\vsidebuild.exe -Solution ""c:\project\$($Env:SOLUTION_PATH)"" -BuildSolutionConfiguration $($ENV:BUILD_TYPE)"
       # Zip up the output files as needed
       - name: Zip Build Output
@@ -162,7 +152,7 @@ jobs:
           $exclusions = "packages"
           # Trying to get any .json schema files (not currently working)
           # Gets any files with the listed extensions.
-          Get-ChildItem -recurse -Path "$($Env:GITHUB_WORKSPACE)" -include "*.clz", "*.cpz", "*.cplz", "*.nuspec" | ForEach-Object {
+          Get-ChildItem -recurse -Path "$($Env:GITHUB_WORKSPACE)" -include "*.clz", "*.cpz", "*.cplz", "*.nuspec", "*.md" | ForEach-Object {
             $allowed = $true;
             # Exclude any files in submodules
             foreach ($exclude in $exclusions) {
@@ -192,12 +182,21 @@ jobs:
           Compress-Archive -Path $destination -DestinationPath "$($Env:GITHUB_WORKSPACE)\$($Env:SOLUTION_FILE)-$($Env:VERSION).zip" -Force
           Write-Host "Output Contents post Zip"
           Get-ChildItem -Path $destination
+      # Write the version to a file to be consumed by the push jobs
+      - name: Write Version
+        run: Write-Output "$($Env:VERSION)" | Out-File -FilePath "$($Env:GITHUB_HOME)\output\version.txt"
       # Upload output files
       - name: Upload Build Output
         uses: actions/upload-artifact@v1
         with:
           name: Build
           path: ./${{ env.SOLUTION_FILE}}-${{ env.VERSION}}.zip
+      # Upload the Version file as an artifact
+      - name: Upload version.txt
+        uses: actions/upload-artifact@v1
+        with:
+          name: Version
+          path: ${{env.GITHUB_HOME}}\output\version.txt
       # Create the release on the source repo
       - name: Create Release
         id: create_release
@@ -223,6 +222,19 @@ jobs:
     needs: Build_Project
     runs-on: windows-2019
     steps:
+      - name: Download Build Version Info
+        uses: actions/download-artifact@v1
+        with:
+          name: Version
+      - name: Set Version Number
+        shell: powershell
+        run: |
+          Get-ChildItem "./Version"
+          $version = Get-Content -Path ./Version/version.txt
+          Write-Host "Version: $version"
+          echo "VERSION=$version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+          Remove-Item -Path ./Version/version.txt
+          Remove-Item -Path ./Version
       - name: Download Build output
         uses: actions/download-artifact@v1
         with:
@@ -234,10 +246,10 @@ jobs:
           Remove-Item -Path .\*.zip
       - name: Copy Files to root & delete output directory
         run: |
-          Remove-Item -Path .\* -Include @("*.cpz","*.md","*.cplz","*.json","*.dll","*.clz")  
+          Remove-Item -Path .\* -Include @("*.cpz","*.md","*.cplz","*.json","*.dll","*.clz","*.md")  
           Get-ChildItem -Path .\output\* | Copy-Item -Destination .\
           Remove-Item -Path .\output -Recurse
-      - name: Get nuget File
+      - name: Get nuget File 
         shell: powershell
         run: |
           $nuspec_file = Get-ChildItem *.nuspec -recurse 
@@ -247,12 +259,12 @@ jobs:
       - name: Add Github Packages source
         run: nuget sources add -name github -source https://nuget.pkg.github.com/pepperdash/index.json -username Pepperdash -password ${{ secrets.GITHUB_TOKEN }}
       # Pushes to nuget, not needed unless publishing publicly
-      #- name: Add nuget.org API Key
-      #  run: nuget setApiKey ${{ secrets.NUGET_API_KEY }}
+      - name: Add nuget.org API Key
+        run: nuget setApiKey ${{ secrets.NUGET_API_KEY }}
       - name: Create nuget package
-        run: nuget pack "./${{ env.NUSPEC_FILE}}.nuspec" -version ${{ needs.Build_Project.outputs.version }}
+        run: nuget pack "./${{ env.NUSPEC_FILE}}.nuspec" -version ${{ env.VERSION }}
       - name: Publish nuget package to Github registry
         run: nuget push **/*.nupkg -source github
       # Pushes to nuget, not needed unless publishing publicly >> this pushes package to nuget.org
-      #- name: Publish nuget package to nuget.org
-      #  run: nuget push **/*.nupkg -Source https://api.nuget.org/v3/index.json
+      - name: Publish nuget package to nuget.org
+        run: nuget push **/*.nupkg -Source https://api.nuget.org/v3/index.json

.github/workflows/essentialsplugins-releasebuilds.yml

@@ -1,38 +1,37 @@
-name: Release Build Using Docker
+name: Main Build using Docker
 
 on:
   release:
     types:
-      - created
+      - released
     branches:
       - main
 
 env:
   # Do not edit this, we're just creating it here
   VERSION: 0.0.0-buildtype-buildnumber
   # Defaults to debug for build type
-  BUILD_TYPE: Release
+  BUILD_TYPE: Debug
   # Defaults to master as the release branch.  Change as necessary
   RELEASE_BRANCH: main
 jobs:
   Build_Project:
     runs-on: windows-2019
-    outputs:
-      version: ${{steps.setVersionNumber.outputs.version}}
     steps:
       # First we checkout the source repo
       - name: Checkout repo
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
+      # Fetch all tags
+      - name: Fetch tags
+        run: git fetch --tags
+      # Generate the appropriate version number
       - name: Set Version Number
-        id: setVersionNumber
         shell: powershell
         env:
           TAG_NAME: ${{ github.event.release.tag_name }}
-        run: |
-          echo "VERSION=$($Env:TAG_NAME)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-          echo "::set-output name=version::$($Env:TAG_NAME)"
+        run: echo "VERSION=$($Env:TAG_NAME)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
       # Use the version number to set the version of the assemblies
       - name: Update AssemblyInfo.cs
         shell: powershell
@@ -45,7 +44,6 @@ jobs:
           Write-Output "AssemblyVersion = $NewAssemblyVersion"
           $NewAssemblyInformationalVersion = 'AssemblyInformationalVersion("' + $Version + '")'
           Write-Output "AssemblyInformationalVersion = $NewAssemblyInformationalVersion"
-
           foreach ($o in $input) {
               Write-output $o.FullName
               $TmpFile = $o.FullName + ".tmp"
@@ -58,13 +56,11 @@ jobs:
               move-item $TmpFile $o.FullName -force
             }
           }
-
           function Update-AllAssemblyInfoFiles ( $version ) {
               foreach ($file in "AssemblyInfo.cs", "AssemblyInfo.vb" ) {
                   get-childitem -Path $Env:GITHUB_WORKSPACE -recurse | Where-Object { $_.Name -eq $file } | Update-SourceVersion $version ;
               }
           }
-
           # validate arguments
           $r = [System.Text.RegularExpressions.Regex]::Match($Env:VERSION, "\d+\.\d+\.\d+.*");
           if ($r.Success) {
@@ -77,12 +73,10 @@ jobs:
               Write-Output " ";
               Write-Output "Unable to apply version to AssemblyInfo.cs files";
           }
-      - name: add PepperDash Eng Feed 
-        run: nuget sources add -name github -source https://nuget.pkg.github.com/pepperdash-engineering/index.json -username ${{ secrets.GH_PACKAGE_USER }} -password ${{ secrets.GH_PACKAGE_PASSWORD  }}
       - name: restore Nuget Packages
         run: nuget install .\packages.config -OutputDirectory .\packages -ExcludeVersion
       # Set the SOLUTION_PATH
-      - name: Get SLN Path
+      - name: Get SLN Path 
         shell: powershell
         run: |
           $solution_path = Get-ChildItem *.sln -recurse 
@@ -91,7 +85,7 @@ jobs:
           Write-Output $solution_path
           echo "SOLUTION_PATH=$($solution_path)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
         # Set the SOLUTION_FILE
-      - name: Get SLN File
+      - name: Get SLN File 
         shell: powershell
         run: |
           $solution_file = Get-ChildItem .\*.sln -recurse -Path "$($Env:GITHUB_WORKSPACE)" 
@@ -105,7 +99,7 @@ jobs:
       # Build the solutions in the docker image
       - name: Build Solution
         shell: powershell
-        run: |
+        run: | 
           Invoke-Expression "docker run --rm --mount type=bind,source=""$($Env:GITHUB_WORKSPACE)"",target=""c:/project"" pepperdash/sspbuilder c:\cihelpers\vsidebuild.exe -Solution ""c:\project\$($Env:SOLUTION_PATH)"" -BuildSolutionConfiguration $($ENV:BUILD_TYPE)"
       # Zip up the output files as needed
       - name: Zip Build Output
@@ -117,7 +111,7 @@ jobs:
           $exclusions = "packages"
           # Trying to get any .json schema files (not currently working)
           # Gets any files with the listed extensions.
-          Get-ChildItem -recurse -Path "$($Env:GITHUB_WORKSPACE)" -include "*.clz", "*.cpz", "*.cplz", "*.nuspec" | ForEach-Object {
+          Get-ChildItem -recurse -Path "$($Env:GITHUB_WORKSPACE)" -include "*.clz", "*.cpz", "*.cplz", "*.nuspec", "*.md" | ForEach-Object {
             $allowed = $true;
             # Exclude any files in submodules
             foreach ($exclude in $exclusions) {
@@ -147,17 +141,26 @@ jobs:
           Compress-Archive -Path $destination -DestinationPath "$($Env:GITHUB_WORKSPACE)\$($Env:SOLUTION_FILE)-$($Env:VERSION).zip" -Force
           Write-Host "Output Contents post Zip"
           Get-ChildItem -Path $destination
+      # Write the version to a file to be consumed by the push jobs
+      - name: Write Version
+        run: Write-Output "$($Env:VERSION)" | Out-File -FilePath "$($Env:GITHUB_HOME)\output\version.txt"
       # Upload output files
       - name: Upload Build Output
         uses: actions/upload-artifact@v1
         with:
           name: Build
           path: ./${{ env.SOLUTION_FILE}}-${{ env.VERSION}}.zip
+      # Upload the Version file as an artifact
+      - name: Upload version.txt
+        uses: actions/upload-artifact@v1
+        with:
+          name: Version
+          path: ${{env.GITHUB_HOME}}\output\version.txt
       # Upload the build package to the release
       - name: Upload Release Package
         id: upload_release
         uses: actions/upload-release-asset@v1
-        with:
+        with:   
           upload_url: ${{ github.event.release.upload_url }}
           asset_path: ./${{ env.SOLUTION_FILE}}-${{ env.VERSION}}.zip
           asset_name: ${{ env.SOLUTION_FILE}}-${{ env.VERSION}}.zip
@@ -168,6 +171,19 @@ jobs:
     needs: Build_Project
     runs-on: windows-2019
     steps:
+      - name: Download Build Version Info
+        uses: actions/download-artifact@v1
+        with:
+          name: Version
+      - name: Set Version Number
+        shell: powershell
+        run: |
+          Get-ChildItem "./Version"
+          $version = Get-Content -Path ./Version/version.txt
+          Write-Host "Version: $version"
+          echo "VERSION=$version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+          Remove-Item -Path ./Version/version.txt
+          Remove-Item -Path ./Version
       - name: Download Build output
         uses: actions/download-artifact@v1
         with:
@@ -179,10 +195,10 @@ jobs:
           Remove-Item -Path .\*.zip
       - name: Copy Files to root & delete output directory
         run: |
-          Remove-Item -Path .\* -Include @("*.cpz","*.md","*.cplz","*.json","*.dll","*.clz")  
+          Remove-Item -Path .\* -Include @("*.cpz","*.md","*.cplz","*.json","*.dll","*.clz","*.md")  
           Get-ChildItem -Path .\output\* | Copy-Item -Destination .\
           Remove-Item -Path .\output -Recurse
-      - name: Get nuget File
+      - name: Get nuget File 
         shell: powershell
         run: |
           $nuspec_file = Get-ChildItem *.nuspec -recurse 
@@ -192,12 +208,12 @@ jobs:
       - name: Add Github Packages source
         run: nuget sources add -name github -source https://nuget.pkg.github.com/pepperdash/index.json -username Pepperdash -password ${{ secrets.GITHUB_TOKEN }}
       # Pushes to nuget, not needed unless publishing publicly
-      #- name: Add nuget.org API Key
-      #  run: nuget setApiKey ${{ secrets.NUGET_API_KEY }}
+      - name: Add nuget.org API Key
+        run: nuget setApiKey ${{ secrets.NUGET_API_KEY }}
       - name: Create nuget package
-        run: nuget pack "./${{ env.NUSPEC_FILE}}.nuspec" -version ${{ needs.Build_Project.outputs.version }}
+        run: nuget pack "./${{ env.NUSPEC_FILE}}.nuspec" -version ${{ env.VERSION }}
       - name: Publish nuget package to Github registry
         run: nuget push **/*.nupkg -source github
       # Pushes to nuget, not needed unless publishing publicly >> this pushes package to nuget.org
-      #- name: Publish nuget package to nuget.org
-      #  run: nuget push **/*.nupkg -Source https://api.nuget.org/v3/index.json
+      - name: Publish nuget package to nuget.org
+        run: nuget push **/*.nupkg -Source https://api.nuget.org/v3/index.json

epi-barco-g60/Plugin.BarcoG60.nuspec

@@ -8,11 +8,11 @@
     <owners>pepperdash</owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <license type="expression">MIT</license>
-    <projectUrl>https://github.com/PepperDash-Engineering/epi-projector-barco-g60</projectUrl>
+    <projectUrl>https://github.com/PepperDash/epi-projector-barco-g60</projectUrl>
     <copyright>Copyright 2022</copyright>
     <description>This software is a plugin designed to work as a part of PepperDash Essentials for Crestron control processors.  It provides control and feedback for Barco G60 Projector.</description>
     <tags>crestron 3series 4series</tags>
-    <repository type="git" url="https://github.com/PepperDash-Engineering/epi-projector-barco-g60"/>    
+    <repository type="git" url="https://github.com/PepperDash/epi-projector-barco-g60"/>    
   </metadata>
   <files>
     <file src="**" target="lib\net35"/>