From 111c91344d7cdb425e5daffc501920cda33d760e Mon Sep 17 00:00:00 2001
From: Mike Dickson <mike.dickson@utopiaskye.com>
Date: Thu, 4 Jan 2024 00:46:20 -0500
Subject: [PATCH] Minor tweaks to the dotnet build scripting

---
 .github/workflows/dotnetci.yml    | 20 ++++++++--
 .github/workflows/msbuildnet6.yml | 62 -------------------------------
 2 files changed, 16 insertions(+), 66 deletions(-)
 delete mode 100644 .github/workflows/msbuildnet6.yml

diff --git a/.github/workflows/dotnetci.yml b/.github/workflows/dotnetci.yml
index 2b964b5bc91..b179b188b2f 100644
--- a/.github/workflows/dotnetci.yml
+++ b/.github/workflows/dotnetci.yml
@@ -11,13 +11,25 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.*
+        dotnet-version: 6.0.x
+
     - name: Restore dependencies
       run: dotnet restore
+
     - name: Build
-      run: dotnet build --no-restore
-#    - name: Run Tests
-#      run: dotnet test --logger "trx;LogFileName=<TestResults.trx>"
+      run: dotnet build -c Release --no-restore
+
+    - name: Run Tests
+      run: dotnet test -c Release --no-build --verbosity normal --filter "Category!=LongRunning"
+
+#    - name: Pack
+#      run: dotnet pack src/Orleans.SyncWork/Orleans.SyncWork.csproj -c Release --no-restore --no-build --include-symbols -p:SymbolPackageFormat=snupkg -o .
+#
+#    - name: Push to NuGet
+#      run: dotnet nuget push *.nupkg --skip-duplicate -s https://api.nuget.org/v3/index.json -k ${{secrets.NUGET_API_KEY}}
diff --git a/.github/workflows/msbuildnet6.yml b/.github/workflows/msbuildnet6.yml
deleted file mode 100644
index bee12ac61cd..00000000000
--- a/.github/workflows/msbuildnet6.yml
+++ /dev/null
@@ -1,62 +0,0 @@
-name: .msbuildnet6
-
-on:
-  push:
-    branches: [ "master" ]
-    paths:
-      - '**.cs'
-  workflow_dispatch:
-
-jobs:
-  build:
-
-    if: github.repository == 'opensim/opensim'
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - name: shortsha
-      id: vars
-      run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"   
-    - name: preBuild
-      run: bash ${GITHUB_WORKSPACE}/runprebuild.sh
-
-    - name: Setup dotnet
-      uses: actions/setup-dotnet@v3
-      with:
-        dotnet-version: '6.0.x'
-    - name: Build
-      id: build
-      run: dotnet build --configuration Release OpenSim.sln
-
-    - name: release
-      if: success()
-      run: zip -r LastDotNetBuild.zip bin ThirdPartyLicenses README.md CONTRIBUTORS.txt LICENSE.txt 
-    - uses: softprops/action-gh-release@v1
-      if: success()
-      with:
-          tag_name: r${{ steps.vars.outputs.sha_short }}
-          name: LastDotNetAutoBuild
-          files: LastDotNetBuild.zip
-
-    - name: report push to irc if from main OpenSim repository
-      if: github.event_name == 'push' && github.repository_owner == 'opensim'
-      uses: rectalogic/notify-irc@v1
-      with:
-        channel: "#opensim-dev"
-        server: "irc.libera.chat"
-        nickname: osgithub
-        message: |
-          ${{ github.actor }} pushed to ${{ github.repository }}
-          ${{ join(github.event.commits.*.message, '\n') }}
-          dotnet compile: ${{ steps.build.conclusion }}
-
-    - name: manual report to irc if from main OpenSim repository
-      if: github.event_name == 'workflow_dispatch' && github.repository_owner == 'opensim'
-      uses: rectalogic/notify-irc@v1
-      with:
-        channel: "#opensim-dev"
-        server: "irc.libera.chat"
-        nickname: osgithub
-        message: |
-          ${{ github.repository }}
-          dotnet compile: ${{ steps.build.conclusion }}