Merge pull request #119 from Erol444/fix-13-06-2022

Fix 13 06 2022

Author: vinaghost

.github/workflows/pre-release.yml

@@ -48,43 +48,25 @@ jobs:
     runs-on: windows-2019
     needs: version
     steps:
-      - name: setup-msbuild
-        uses: microsoft/setup-msbuild@v1
-
-      - uses: actions/checkout@v2
-
-      - name: Setup NuGet
-        uses: NuGet/[email protected]
+      - name: Setup dotnet
+        uses: actions/setup-dotnet@v2
+        with:
+            dotnet-version: 6.0.x
 
+      - name: 'Checkout repo' 
+        uses: actions/checkout@v2
+
       - name: Navigate to Workspace
         run: cd $GITHUB_WORKSPACE
 
-      - name: Get cache
-        uses: actions/cache@v2
-        with:
-          path: |
-              packages
-              TbsCore/obj/project.assets.json
-              TbsCore/TbsCore.csproj.nuget.g.targets
-              TbsCore/TbsCore.csproj.nuget.g.props.              
-          key: ${{ runner.os }}-nuget-${{ hashFiles('TbsCore/packages.lock.json') }}
-          restore-keys: |
-              ${{ runner.os }}-nuget-
-
-      - name: Restore Packages
-        run: |
-          nuget restore TbsCore/TbsCore.csproj -PackagesDirectory packages
-          nuget restore TravBotSharp/TbsWinForms.csproj -PackagesDirectory packages
-
       - name: Build Bot
         run: |
-          msbuild.exe TravBotSharp.sln /t:TbsWinForms /nologo /nr:false /p:DeleteExistingFiles=True /p:platform="Any CPU" /p:configuration="Release" /m /p:BuildProjectReferences=true /p:BUILD_NUMBER=${{needs.version.outputs.version}}.0
-
+          dotnet publish TbsWinformNet6 -c Release --self-contained true -p:PublishSingleFile=true -r win-x86 -p:AssemblyVersion=${{needs.version.outputs.version}}.0
       - name: Upload a Build Artifact
         uses: actions/upload-artifact@v2
         with:
           name: TBS-prerelease
-          path: TravBotSharp\bin\Release
+          path: TbsWinformNet6\bin\Release\net6.0-windows\win-x86\publish\
           if-no-files-found: error
 
   prerelease:

.github/workflows/release.yml

@@ -49,44 +49,26 @@ jobs:
     runs-on: windows-2019
     needs: version
     steps:
-      - name: setup-msbuild
-        uses: microsoft/setup-msbuild@v1     
-
-      - name: Setup NuGet
-        uses: NuGet/[email protected]
+      - name: Setup dotnet
+        uses: actions/setup-dotnet@v2
+        with:
+            dotnet-version: 6.0.x
 
       - name: 'Checkout repo' 
         uses: actions/checkout@v2
 
       - name: Navigate to Workspace
         run: cd $GITHUB_WORKSPACE
-        
-      - name: Get cache
-        uses: actions/cache@v2
-        with:
-          path: |
-              packages
-              TbsCore/obj/project.assets.json
-              TbsCore/TbsCore.csproj.nuget.g.targets
-              TbsCore/TbsCore.csproj.nuget.g.props.              
-          key: ${{ runner.os }}-nuget-${{ hashFiles('TbsCore/packages.lock.json') }}
-          restore-keys: |
-              ${{ runner.os }}-nuget-
-              
-      - name: Restore Packages
-        run: |
-          nuget restore TbsCore/TbsCore.csproj -PackagesDirectory packages
-          nuget restore TravBotSharp/TbsWinForms.csproj -PackagesDirectory packages
 
       - name: Build Bot
         run: |
-          msbuild.exe TravBotSharp.sln /t:TbsWinForms /nologo /nr:false /p:DeleteExistingFiles=True /p:platform="Any CPU" /p:configuration="Release" /m /p:BuildProjectReferences=true /p:BUILD_NUMBER=${{needs.version.outputs.version}}.0
+          dotnet publish TbsWinformNet6 -c Release --self-contained true -p:PublishSingleFile=true -r win-x86 -p:AssemblyVersion=${{needs.version.outputs.version}}.0
 
       - name: Upload a Build Artifact
         uses: actions/upload-artifact@v2
         with:
           name: TBS-release
-          path: TravBotSharp\bin\Release
+          path: TbsWinformNet6\bin\Release\net6.0-windows\win-x86\publish\
           if-no-files-found: error
 
   release: