fucking around with my frameworks again, dwai

Author: VariableVixen

.github/workflows/build.yml .github/workflows/deploy.yml.github/workflows/build.yml renamed to .github/workflows/deploy.yml

@@ -1,4 +1,4 @@
-name: Build
+name: Deploy
 
 # Put your personal access token in a repository secret named PAT for cross-repository access
 permissions:
@@ -16,7 +16,7 @@ on:
 
 env:
   INTERNAL_NAME: XIVComboVX
-  CONFIGURATION: Release
+  CONFIGURATION: release
   PERSONAL_PLUGIN_REPO: PrincessRTFM/MyDalamudPlugins
   DOTNET_CLI_TELEMETRY_OPTOUT: true
   DOTNET_NOLOGO: true
@@ -49,6 +49,7 @@ jobs:
         run: |
           echo "Current version is ${{ steps.data.outputs.buildVersion }} for tag ${{ steps.data.outputs.tagName }} (exists = ${{ steps.check-version-tag.outputs.tagExists }})"
         shell: bash
+
   build:
     needs: precheck
     if: needs.precheck.outputs.tagExists == 'false'
@@ -72,7 +73,7 @@ jobs:
       uses: actions/upload-artifact@v4
       with:
         name: PluginRepoZip
-        path: ${{ env.INTERNAL_NAME }}/bin/${{ env.CONFIGURATION }}/${{ env.INTERNAL_NAME }}
+        path: ${{ env.INTERNAL_NAME }}/bin/${{ env.CONFIGURATION }}/portable/${{ env.INTERNAL_NAME }}
         if-no-files-found: error
         retention-days: 14
     - name: Tag

.github/workflows/pr-test.yml

@@ -0,0 +1,47 @@
+name: Compile
+
+# Put your personal access token in a repository secret named PAT for cross-repository access
+permissions:
+  contents: write
+
+on:
+  workflow_dispatch:
+  pull_request:
+    paths-ignore:
+      - '*.md'
+    branches:
+      - master
+      - main
+      - release
+
+env:
+  INTERNAL_NAME: XIVComboVX
+  CONFIGURATION: release
+  DOTNET_CLI_TELEMETRY_OPTOUT: true
+  DOTNET_NOLOGO: true
+
+jobs:
+  build:
+    runs-on: windows-2022
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+      with:
+        submodules: recursive
+    - name: Setup MSBuild
+      uses: microsoft/[email protected]
+    - name: Download Dalamud
+      run: |
+        Invoke-WebRequest -Uri https://goatcorp.github.io/dalamud-distrib/latest.zip -OutFile latest.zip
+        Expand-Archive -Force latest.zip "$env:AppData\XIVLauncher\addon\Hooks\dev\"
+    - name: Restore
+      run: dotnet restore -r win
+    - name: Build
+      run: dotnet build -c ${{ env.CONFIGURATION }} --no-restore
+    - name: Upload build
+      uses: actions/upload-artifact@v4
+      with:
+        name: PluginRepoZip
+        path: ${{ env.INTERNAL_NAME }}/bin/${{ env.CONFIGURATION }}/portable/${{ env.INTERNAL_NAME }}
+        if-no-files-found: error
+        retention-days: 14

XIVComboVX/framework.props

@@ -6,7 +6,6 @@
 		<Product>NAME</Product>
 		<Version>MAJOR.MINOR.PATCH</Version>
 		<Description>SUMMARY</Description>
-		<Description>SUMMARY</Description>
 		<OutputType>{Library|Exe}</OutputType>
 
 	- RECOMMENDED
@@ -23,13 +22,16 @@
 		<Deterministic>(DEPENDENT ON OUTPUT TYPE)</Deterministic>
 		<CopyLocalLockFileAssemblies>(DEPENDENT ON OUTPUT TYPE)</CopyLocalLockFileAssemblies>
 		<ProduceReferenceAssembly>(DEPENDENT ON OUTPUT TYPE)</ProduceReferenceAssembly>
+		<PublishDir>bin\publish\$(RuntimeIdentifier)-$(Configuration.ToLower())\</PublishDir>
 
 	- STATIC OVERRIDABLE:
 		<Platforms>x64</Platforms>
 		<PlatformTarget>x64</PlatformTarget>
-		<TargetFramework>net7</TargetFramework>
+		<TargetFramework>net9</TargetFramework>
+		<PublishSingleFile>true</PublishSingleFile>
 
 	- SPECIAL:
+		<OutputPath>bin\$(Configuration.ToLower())\$(RuntimeIdentifier.ToLower() || "portable")</OutputPath>
 		<Authors>VariableVixen[, $(Authors)]</Authors>
 		<ContinuousIntegrationBuild>(AUTOMATICALLY ENABLED ON KNOWN CI SYSTEMS)</ContinuousIntegrationBuild>
 		<DebugSymbols>(DEPENDENT ON BUILD CONFIGURATION)</DebugSymbols>
@@ -42,7 +44,7 @@
 
 	<PropertyGroup Condition=" '$(Product)' != '' ">
 		<AssemblyName Condition=" '$(AssemblyName)' == '' ">$(Product.Replace("-", "."))</AssemblyName>
-		<PackageId Condition=" '$(PackageId)' == '' ">$(Product.Replace("-", "."))</PackageId>
+		<PackageId Condition=" '$(PackageId)' == '' ">$(Product.Replace("-", ".").Replace(" ", ""))</PackageId>
 		<Title Condition=" '$(Title)' == '' ">$(Product)</Title>
 		<PackageProjectUrl Condition=" '$(PackageProjectUrl)' == '' ">https://github.com/PrincessRTFM/$(Product)</PackageProjectUrl>
 	</PropertyGroup>
@@ -55,7 +57,7 @@
 		<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
 		<LangVersion>12</LangVersion>
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-		<OutputPath>bin\$(Configuration)\</OutputPath>
+		<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
 		<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
 		<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
 		<PublishRelease>true</PublishRelease>
@@ -66,32 +68,50 @@
 		<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
 		<ImplicitUsings>false</ImplicitUsings>
 		<NoWarn>CA1805,CA1852,CA1707,$(NoWarn)</NoWarn>
+		<PathMap>$(SolutionDir)=./</PathMap>
 	</PropertyGroup>
 
 	<Choose>
-		<When Condition=" '$(Authors)' == '' ">
+		<When Condition=" '$(RuntimeIdentifier)' == '' ">
 			<PropertyGroup>
-				<Authors>VariableVixen</Authors>
+				<OutputPath>bin\$(Configuration.ToLower())\portable</OutputPath>
 			</PropertyGroup>
 		</When>
-		<When Condition=" ! $([System.Text.RegularExpressions.Regex]::IsMatch($(Authors.ToLower()), '\bvariablevixen\b')) ">
+		<Otherwise>
 			<PropertyGroup>
-				<Authors>VariableVixen, $(Authors)</Authors>
+				<OutputPath>bin\$(Configuration.ToLower())\$(RuntimeIdentifier.ToLower())</OutputPath>
 			</PropertyGroup>
-		</When>
+		</Otherwise>
 	</Choose>
 
 	<PropertyGroup>
+		<PublishSingleFile Condition=" '$(PublishSingleFile)' == '' ">true</PublishSingleFile>
 		<Copyright Condition=" '$(Copyright)' == '' ">Copyleft $(Authors)</Copyright>
 		<RepositoryUrl Condition=" '$(RepositoryUrl)' == '' ">$(PackageProjectUrl).git</RepositoryUrl>
 		<Platforms Condition=" '$(Platforms)' == '' ">x64</Platforms>
 		<PlatformTarget Condition=" '$(PlatformTarget)' == '' ">x64</PlatformTarget>
-		<TargetFramework Condition=" '$(TargetFramework)' == '' ">net7</TargetFramework>
+		<TargetFramework Condition=" '$(TargetFramework)' == '' ">net9</TargetFramework>
 		<AssemblyVersion Condition=" '$(AssemblyVersion)' == '' ">$(Version)</AssemblyVersion>
 		<AssemblyFileVersion Condition=" '$(AssemblyFileVersion)' == '' ">$(AssemblyVersion)</AssemblyFileVersion>
-		<PathMap>$(SolutionDir)=./</PathMap>
 	</PropertyGroup>
 
+	<PropertyGroup Condition=" '$(PublishDir)' == '' ">
+		<PublishDir>bin\publish\$(RuntimeIdentifier)-$(Configuration.ToLower())\</PublishDir>
+	</PropertyGroup>
+
+	<Choose>
+		<When Condition=" '$(Authors)' == '' ">
+			<PropertyGroup>
+				<Authors>VariableVixen</Authors>
+			</PropertyGroup>
+		</When>
+		<When Condition=" ! $([System.Text.RegularExpressions.Regex]::IsMatch($(Authors.ToLower()), '\bvariablevixen\b')) ">
+			<PropertyGroup>
+				<Authors>VariableVixen, $(Authors)</Authors>
+			</PropertyGroup>
+		</When>
+	</Choose>
+
 	<Choose>
 		<When Condition=" '$(OutputType.ToLower())' == 'library' ">
 			<PropertyGroup>
@@ -109,8 +129,7 @@
 		</Otherwise>
 	</Choose>
 
-	<PropertyGroup>
-		<!-- this is non-exhaustive, but includes the CI systems I'm aware of and will be updated as I discover more -->
+	<PropertyGroup><!-- this is non-exhaustive, but includes the CI systems I'm aware of and will be updated as I discover more -->
 		<ContinuousIntegrationBuild Condition=" '$(GITHUB_ACTIONS)' == 'true' ">true</ContinuousIntegrationBuild>
 		<ContinuousIntegrationBuild Condition=" '$(TF_BUILD)' == 'true' ">true</ContinuousIntegrationBuild>
 	</PropertyGroup>