Merge remote-tracking branch 'upstream/master'

Author: ArthurGamerHD

.github/workflows/docfx.yml

@@ -22,9 +22,8 @@ jobs:
         run: |
           $MidnightUtc = [DateTime]::UtcNow.Date
           $BranchName = "${{ github.ref_name }}".replace('/','-').replace('.','-')
-          $ApiVersion = (Select-Xml -Path 'src/Artemis.Core/Artemis.Core.csproj' -XPath '//PluginApiVersion').Node.InnerText
           $NumberOfCommitsToday = (git log --after=$($MidnightUtc.ToString("o")) --oneline | Measure-Object -Line).Lines
-          $VersionNumber = "$ApiVersion.$($MidnightUtc.ToString("yyyy.MMdd")).$NumberOfCommitsToday"
+          $VersionNumber = "1.$($MidnightUtc.ToString("yyyy.MMdd")).$NumberOfCommitsToday"
           # If we're not in master, add the branch name to the version so it counts as prerelease 
           if ($BranchName -ne "master") { $VersionNumber += "-$BranchName" }
           "version-number=$VersionNumber" >> $Env:GITHUB_OUTPUT
@@ -52,26 +51,12 @@ jobs:
         uses: actions/checkout@v4
         with:
           path: Artemis
-      - name: Checkout Plugins
-        uses: actions/checkout@v4
-        with:
-          repository: Artemis-RGB/Artemis.Plugins
-          path: Artemis.Plugins
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '9.0.x'
+          dotnet-version: '10.0.x'
       - name: Publish Artemis
         run: dotnet publish --configuration Release -p:Version=${{ needs.version.outputs.version-number }} --runtime ${{ matrix.rid }} --output build/${{ matrix.rid }} --self-contained Artemis/src/Artemis.UI.${{ matrix.csproj }}/Artemis.UI.${{ matrix.csproj }}.csproj
-      - name: Publish Plugins
-        run: |
-          New-Item -ItemType "Directory" -Path build/${{ matrix.rid }}/Plugins/
-          Get-ChildItem -File -Recurse -Filter *.csproj Artemis.Plugins/src/ | 
-          Foreach-Object -Parallel {
-              dotnet publish --configuration Release --runtime ${{ matrix.rid }} --output build-plugins/$($_.BaseName) --no-self-contained $($_.FullName);
-              Compress-Archive -Path "build-plugins/$($_.BaseName)" -DestinationPath "build/${{ matrix.rid }}/Plugins/$($_.BaseName).zip";
-          }
-        shell: pwsh
       - name: Upload Artifact
         uses: actions/upload-artifact@v4
         with:

.github/workflows/master.yml

@@ -22,9 +22,8 @@ jobs:
         run: |
           $MidnightUtc = [DateTime]::UtcNow.Date
           $BranchName = "${{ github.ref_name }}".replace('/','-').replace('.','-')
-          $ApiVersion = (Select-Xml -Path 'src/Artemis.Core/Artemis.Core.csproj' -XPath '//PluginApiVersion').Node.InnerText
           $NumberOfCommitsToday = (git log --after=$($MidnightUtc.ToString("o")) --oneline | Measure-Object -Line).Lines
-          $VersionNumber = "$ApiVersion.$($MidnightUtc.ToString("yyyy.MMdd")).$NumberOfCommitsToday"
+          $VersionNumber = "1.$($MidnightUtc.ToString("yyyy.MMdd")).$NumberOfCommitsToday"
           # If we're not in master, add the branch name to the version so it counts as prerelease 
           if ($BranchName -ne "master") { $VersionNumber += "-$BranchName" }
           "version-number=$VersionNumber" >> $Env:GITHUB_OUTPUT
@@ -37,7 +36,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '9.0.x'
+          dotnet-version: '10.0.x'
       - name: Checkout
         uses: actions/checkout@v4
       - name: Pack Artemis.Core