Skip to content

Commit 39ebd0b

Browse files
Banane9Banane9
committed
Update Workflows and project setup
1 parent 7577320 commit 39ebd0b

5 files changed

Lines changed: 23 additions & 67 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,9 @@ jobs:
4343
- name: Setup Dotnet
4444
uses: actions/setup-dotnet@v4
4545
with:
46-
dotnet-version: 8.x
46+
dotnet-version: 10.x
4747
source-url: https://nuget.pkg.github.com/ResoniteModdingGroup/index.json
48-
49-
- name: Add MonkeyLoader NuGet Source
50-
run: dotnet nuget add source https://pkg.munally.com/MonkeyModdingTroop/index.json
51-
48+
5249
- name: Restore NuGet Package Cache
5350
uses: actions/cache/restore@v4
5451
with:
@@ -98,12 +95,9 @@ jobs:
9895
- name: Setup Dotnet
9996
uses: actions/setup-dotnet@v4
10097
with:
101-
dotnet-version: 8.x
98+
dotnet-version: 10.x
10299
source-url: https://nuget.pkg.github.com/ResoniteModdingGroup/index.json
103100

104-
- name: Add MonkeyLoader NuGet Source
105-
run: dotnet nuget add source https://pkg.munally.com/MonkeyModdingTroop/index.json
106-
107101
- name: Restore NuGet Package Cache
108102
uses: actions/cache/restore@v4
109103
with:
@@ -126,4 +120,4 @@ jobs:
126120
# If some rules are not applicable, you can disable them
127121
# using the --excluded-rules or --excluded-rule-ids option
128122
- name: Validate Package(s)
129-
run: meziantou.validate-nuget-package (Get-ChildItem -Recurse "${{ env.NuGetDirectory }}" -Include *.nupkg) --excluded-rules IconMustBeSet
123+
run: meziantou.validate-nuget-package "${{ env.NuGetDirectory }}/DynamicVariablePowerTools.nupkg" --excluded-rules IconMustBeSet

‎.github/workflows/publish.yml‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
uses: mikepenz/action-gh-release@v1 #softprops/action-gh-release
5050
with:
5151
body: ${{steps.build_changelog.outputs.changelog}}
52-
files: ${{ env.NuGetDirectory }}/*.nupkg
52+
files: ${{ env.NuGetDirectory }}/DynamicVariablePowerTools.nupkg
5353
fail_on_unmatched_files: true
5454
fail_on_asset_upload_issue: true
5555
prerelease: ${{ contains(github.ref, '-') }} # simple check for vX.Y.Z-something
@@ -68,17 +68,11 @@ jobs:
6868
- name: Setup Dotnet
6969
uses: actions/setup-dotnet@v4
7070
with:
71-
dotnet-version: 8.x
71+
dotnet-version: 10.x
7272
source-url: https://nuget.pkg.github.com/ResoniteModdingGroup/index.json
73-
74-
- name: Add MonkeyLoader NuGet Source
75-
run: dotnet nuget add source https://pkg.munally.com/MonkeyModdingTroop/index.json
7673

7774
# Publish all NuGet packages to the GitHub feed
7875
# Use --skip-duplicate to prevent errors if a package with the same version already exists.
7976
# If you retry a failed workflow, already published packages will be skipped without error.
8077
- name: Publish NuGet Packages
81-
run: |
82-
foreach($file in (Get-ChildItem "${{ env.NuGetDirectory }}" -Recurse -Include *.nupkg)) {
83-
dotnet nuget push $file --api-key "${{ secrets.GITHUB_TOKEN }}" --source https://nuget.pkg.github.com/ResoniteModdingGroup/index.json --skip-duplicate
84-
}
78+
run: dotnet nuget push "${{ env.NuGetDirectory }}/DynamicVariablePowerTools.nupkg" --api-key "${{ secrets.GITHUB_TOKEN }}" --source https://nuget.pkg.github.com/ResoniteModdingGroup/index.json --skip-duplicate

‎Directory.Build.props‎

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,18 @@
11
<Project>
22
<PropertyGroup>
3-
<OutputType>Library</OutputType>
4-
<TargetFramework>netstandard2.0</TargetFramework>
5-
<AssemblyFileName>$(AssemblyTitle).dll</AssemblyFileName>
6-
<LangVersion>12.0</LangVersion>
7-
<Nullable>enable</Nullable>
8-
<Deterministic>true</Deterministic>
9-
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
10-
<DebugType>portable</DebugType>
11-
<GenerateDocumentationFile>True</GenerateDocumentationFile>
12-
13-
<CopyToLibraries Condition="'$(CopyToLibraries)'==''">true</CopyToLibraries>
14-
15-
<RestoreAdditionalProjectSources>
16-
https://pkg.munally.com/MonkeyModdingTroop/index.json;
17-
https://pkg.munally.com/ResoniteModdingGroup/index.json
18-
</RestoreAdditionalProjectSources>
3+
<ResoniteInstallOnBuild Condition="'$(ResoniteInstallOnBuild)'==''">true</ResoniteInstallOnBuild>
194
</PropertyGroup>
205

216
<PropertyGroup>
227
<PackageReadmeFile>README.md</PackageReadmeFile>
23-
<RepositoryUrl>$(PackageProjectUrl).git</RepositoryUrl>
24-
<RepositoryType>git</RepositoryType>
25-
<IncludeSymbols>False</IncludeSymbols>
26-
<EmbedAllSources>True</EmbedAllSources>
27-
<EmbedUntrackedSources>True</EmbedUntrackedSources>
28-
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
29-
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
308
</PropertyGroup>
319

3210
<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
3311
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
34-
<CopyToLibraries>false</CopyToLibraries>
12+
<ResoniteInstallOnBuild>false</ResoniteInstallOnBuild>
3513
</PropertyGroup>
3614

3715
<PropertyGroup Condition="'$(ResonitePath)'==''">
38-
<ResonitePath>$(MSBuildThisFileDirectory)Resonite</ResonitePath>
39-
<ResonitePath Condition="Exists('C:\Program Files (x86)\Steam\steamapps\common\Resonite\')">C:\Program Files (x86)\Steam\steamapps\common\Resonite</ResonitePath>
40-
<ResonitePath Condition="Exists('$(HOME)/.steam/steam/steamapps/common/Resonite/')">$(HOME)/.steam/steam/steamapps/common/Resonite</ResonitePath>
4116
<ResonitePath Condition="Exists('D:/Files/Games/Resonite/app/')">D:/Files/Games/Resonite/app</ResonitePath>
4217
</PropertyGroup>
4318
</Project>

‎DynamicVariablePowerTools.sln‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1111
README.md = README.md
1212
EndProjectSection
1313
EndProject
14+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
15+
ProjectSection(SolutionItems) = preProject
16+
.github\workflows\build.yml = .github\workflows\build.yml
17+
.github\workflows\publish.yml = .github\workflows\publish.yml
18+
EndProjectSection
19+
EndProject
1420
Global
1521
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1622
Debug|Any CPU = Debug|Any CPU
@@ -25,6 +31,9 @@ Global
2531
GlobalSection(SolutionProperties) = preSolution
2632
HideSolutionNode = FALSE
2733
EndGlobalSection
34+
GlobalSection(NestedProjects) = preSolution
35+
{02EA681E-C7D8-13C7-8484-4AC65E1B71E8} = {07124CF9-EE3D-4A7E-A2F8-8FD07966E423}
36+
EndGlobalSection
2837
GlobalSection(ExtensibilityGlobals) = postSolution
2938
SolutionGuid = {7D505B2E-FBA2-4F50-BC1C-838BC8DF0D5C}
3039
EndGlobalSection

‎DynamicVariablePowerTools/DynamicVariablePowerTools.csproj‎

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<AssemblyTitle>DynamicVariablePowerTools</AssemblyTitle>
4-
<AssemblyFileName>$(AssemblyTitle).dll</AssemblyFileName>
5-
<RootNamespace>DynamicVariablePowerTools</RootNamespace>
6-
</PropertyGroup>
7-
1+
<Project Sdk="Remora.Resonite.Sdk/2.0.10">
82
<PropertyGroup>
93
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
104
<PackageId>DynamicVariablePowerTools</PackageId>
@@ -17,26 +11,16 @@
1711
<PackageProjectUrl>https://github.com/ResoniteModdingGroup/DynamicVariablePowerTools</PackageProjectUrl>
1812
<PackageTags>mod; mods; monkeyloader; resonite; contacts</PackageTags>
1913
</PropertyGroup>
20-
21-
<Target Name="CopyPackage" AfterTargets="Pack">
22-
<Copy Condition="'$(CopyToLibraries)'=='true'" SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).nupkg" DestinationFiles="$(ResonitePath)\MonkeyLoader\Mods\$(PackageId).nupkg" />
23-
<Message Condition="'$(CopyToLibraries)'=='true'" Text="Copied '$(OutputPath)..\$(PackageId).$(PackageVersion).nupkg' to '$(ResonitePath)\MonkeyLoader\Mods\$(PackageId).nupkg'" Importance="high" />
24-
</Target>
2514

2615
<ItemGroup>
2716
<None Include="..\README.md" Pack="true" PackagePath="" />
2817
<None Include="Locale\*" Pack="true" PackagePath="content/Locale/" />
2918
</ItemGroup>
3019

3120
<ItemGroup>
32-
<PackageReference Include="MonkeyLoader.GamePacks.Resonite" Version="0.22.0-beta" />
33-
<PackageReference Include="PolySharp" Version="1.15.0">
34-
<PrivateAssets>all</PrivateAssets>
35-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
36-
</PackageReference>
37-
<PackageReference Include="Resonite.Elements.Core" Version="1.4.3" />
38-
<PackageReference Include="Resonite.Elements.Quantity" Version="1.2.3" />
39-
<PackageReference Include="Resonite.FrooxEngine" Version="2025.1.17.6" />
40-
<PackageReference Include="Resonite.ProtoFluxBindings" Version="2025.3.14.7" />
21+
<ResoniteReference Include="Elements.Core" />
22+
<ResoniteReference Include="Elements.Quantity" />
23+
<ResoniteReference Include="FrooxEngine" />
24+
<ResoniteReference Include="ProtoFluxBindings" />
4125
</ItemGroup>
4226
</Project>

0 commit comments

Comments
 (0)