Skip to content

Commit 2f5bad8

Browse files
committed
undo some dumb things in the framework, was experimenting
1 parent b970257 commit 2f5bad8

File tree

2 files changed

+5
-20
lines changed

2 files changed

+5
-20
lines changed

.github/workflows/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
uses: actions/upload-artifact@v4
7272
with:
7373
name: PluginRepoZip
74-
path: ${{ env.INTERNAL_NAME }}/bin/${{ env.CONFIGURATION }}/portable/${{ env.INTERNAL_NAME }}
74+
path: ${{ env.INTERNAL_NAME }}/bin/${{ env.CONFIGURATION }}/${{ env.INTERNAL_NAME }}
7575
if-no-files-found: error
7676
retention-days: 14
7777
- name: Tag

PositionalGuide/framework.props

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<Deterministic>(DEPENDENT ON OUTPUT TYPE)</Deterministic>
2323
<CopyLocalLockFileAssemblies>(DEPENDENT ON OUTPUT TYPE)</CopyLocalLockFileAssemblies>
2424
<ProduceReferenceAssembly>(DEPENDENT ON OUTPUT TYPE)</ProduceReferenceAssembly>
25-
<PublishDir>bin\publish\$(RuntimeIdentifier)-$(Configuration.ToLower())\</PublishDir>
25+
<PublishDir>bin\publish\$(RuntimeIdentifier.ToLower())-$(Configuration.ToLower())\</PublishDir>
2626
2727
- STATIC OVERRIDABLE:
2828
<Platforms>x64</Platforms>
@@ -31,7 +31,7 @@
3131
<PublishSingleFile>true</PublishSingleFile>
3232
3333
- SPECIAL:
34-
<OutputPath>bin\$(Configuration.ToLower())\$(RuntimeIdentifier.ToLower() || "portable")</OutputPath>
34+
<OutputPath>bin\$(Configuration.ToLower())</OutputPath>
3535
<Authors>VariableVixen[, $(Authors)]</Authors>
3636
<ContinuousIntegrationBuild>(AUTOMATICALLY ENABLED ON KNOWN CI SYSTEMS)</ContinuousIntegrationBuild>
3737
<DebugSymbols>(DEPENDENT ON BUILD CONFIGURATION)</DebugSymbols>
@@ -69,21 +69,9 @@
6969
<ImplicitUsings>false</ImplicitUsings>
7070
<NoWarn>CA1805,CA1852,CA1707,$(NoWarn)</NoWarn>
7171
<PathMap>$(SolutionDir)=./</PathMap>
72+
<OutputPath>bin\$(Configuration.ToLower())</OutputPath>
7273
</PropertyGroup>
7374

74-
<Choose>
75-
<When Condition=" '$(RuntimeIdentifier)' == '' ">
76-
<PropertyGroup>
77-
<OutputPath>bin\$(Configuration.ToLower())\portable</OutputPath>
78-
</PropertyGroup>
79-
</When>
80-
<Otherwise>
81-
<PropertyGroup>
82-
<OutputPath>bin\$(Configuration.ToLower())\$(RuntimeIdentifier.ToLower())</OutputPath>
83-
</PropertyGroup>
84-
</Otherwise>
85-
</Choose>
86-
8775
<PropertyGroup>
8876
<PublishSingleFile Condition=" '$(PublishSingleFile)' == '' ">true</PublishSingleFile>
8977
<Copyright Condition=" '$(Copyright)' == '' ">Copyleft $(Authors)</Copyright>
@@ -93,10 +81,7 @@
9381
<TargetFramework Condition=" '$(TargetFramework)' == '' ">net9</TargetFramework>
9482
<AssemblyVersion Condition=" '$(AssemblyVersion)' == '' ">$(Version)</AssemblyVersion>
9583
<AssemblyFileVersion Condition=" '$(AssemblyFileVersion)' == '' ">$(AssemblyVersion)</AssemblyFileVersion>
96-
</PropertyGroup>
97-
98-
<PropertyGroup Condition=" '$(PublishDir)' == '' ">
99-
<PublishDir>bin\publish\$(RuntimeIdentifier)-$(Configuration.ToLower())\</PublishDir>
84+
<PublishDir Condition=" '$(PublishDir)' == '' ">bin\publish\$(RuntimeIdentifier.ToLower())-$(Configuration.ToLower())\</PublishDir>
10085
</PropertyGroup>
10186

10287
<Choose>

0 commit comments

Comments
 (0)