yes

2024-08-07 06:03:46 +01:00 · 2024-08-07 06:03:46 +01:00 · e397c86963
commit e397c86963
parent 1bcb99430c
6 changed files with 39 additions and 127 deletions
--- a/Mod/.gitignore
+++ b/Mod/.gitignore
@ -356,7 +356,4 @@ healthchecksdb
 MigrationBackup/

 # Ionide (cross platform F# VS Code tools) working folder
-.ionide/
-
-Mod.csproj.user
-ScoreTracker.csproj.user
+.ionide/
--- a/Mod/Directory.Build.props
+++ b/Mod/Directory.Build.props
@ -1,15 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This file contains project properties used by the build. -->
 <Project>
-    <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
-        <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
-        <DisableCopyToPlugins>true</DisableCopyToPlugins>
-        <DisableZipRelease>true</DisableZipRelease>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(NCrunch)' == '1'">
-        <ContinuousIntegrationBuild>false</ContinuousIntegrationBuild>
-        <DisableCopyToPlugins>true</DisableCopyToPlugins>
-        <DisableZipRelease>true</DisableZipRelease>
-    </PropertyGroup>
+	<PropertyGroup>
+		<ImportBSMTTargets>True</ImportBSMTTargets>
+		<BSMTProjectType>BSIPA</BSMTProjectType>
+		<LangVersion>8.0</LangVersion>
+	</PropertyGroup>
 </Project>
--- a/Mod/Directory.Build.targets
+++ b/Mod/Directory.Build.targets
@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file contains the build tasks and targets for verifying the manifest, zipping Release builds,
-     and copying the plugin to to your Beat Saber folder. Only edit this if you know what you are doing. -->
-<Project>
-    <PropertyGroup>
-        <BuildTargetsVersion>2.0</BuildTargetsVersion>
-        <!--Set this to true if you edit this file to prevent automatic updates-->
-        <BuildTargetsModified>false</BuildTargetsModified>
-        <!--Output assembly path without extension-->
-        <OutputAssemblyName>$(OutputPath)$(AssemblyName)</OutputAssemblyName>
-        <!--Path to folder to be zipped. Needs to be relative to the project directory to work without changes to the 'BuildForCI' target.-->
-        <ArtifactDestination>$(OutputPath)Final</ArtifactDestination>
-        <ErrorOnMismatchedVersions Condition="'$(Configuration)' == 'Release'">True</ErrorOnMismatchedVersions>
-    </PropertyGroup>
-    <!--Build Targets-->
-    <!--Displays a warning if BeatSaberModdingTools.Tasks is not installed.-->
-    <Target Name="CheckBSMTInstalled" AfterTargets="BeforeBuild" Condition="'$(BSMTTaskAssembly)' == ''">
-        <Warning Text="The BeatSaberModdingTools.Tasks nuget package doesn't seem to be installed, advanced build targets will not work."/>
-    </Target>
-    <!--Runs a build task to get info about the project used by later targets.-->
-    <Target Name="GetProjectInfo" AfterTargets="CheckBSMTInstalled" DependsOnTargets="CheckBSMTInstalled" Condition="'$(BSMTTaskAssembly)' != ''">
-        <Message Text="Using AssemblyVersion defined in project instead of 'Properties\AssemblyInfo.cs'" Importance="high" Condition="'$(AssemblyVersion)' != ''"/>
-        <GetManifestInfo FailOnError="$(ErrorOnMismatchedVersions)">
-            <Output TaskParameter="PluginVersion" PropertyName="PluginVersion"/>
-            <Output TaskParameter="BasePluginVersion" PropertyName="BasePluginVersion"/>
-            <Output TaskParameter="GameVersion" PropertyName="GameVersion"/>
-        </GetManifestInfo>
-        <PropertyGroup>
-            <AssemblyVersion>$(BasePluginVersion)</AssemblyVersion>
-            <FileVersion>$(BasePluginVersion)</FileVersion>
-            <InformationalVersion>$(BasePluginVersion)</InformationalVersion>
-        </PropertyGroup>
-        <GetCommitInfo ProjectDir="$(ProjectDir)">
-            <Output TaskParameter="CommitHash" PropertyName="CommitHash"/>
-            <Output TaskParameter="Branch" PropertyName="Branch"/>
-            <Output TaskParameter="Modified" PropertyName="GitModified"/>
-        </GetCommitInfo>
-        <PropertyGroup>
-            <!--Build name for artifact/zip file-->
-            <ArtifactName>$(AssemblyName)</ArtifactName>
-            <ArtifactName Condition="'$(PluginVersion)' != ''">$(ArtifactName)-$(PluginVersion)</ArtifactName>
-            <ArtifactName Condition="'$(GameVersion)' != ''">$(ArtifactName)-bs$(GameVersion)</ArtifactName>
-            <ArtifactName Condition="'$(CommitHash)' != '' AND '$(CommitHash)' != 'local'">$(ArtifactName)-$(CommitHash)</ArtifactName>
-        </PropertyGroup>
-    </Target>
-    <!--Build target for Continuous Integration builds. Set up for GitHub Actions.-->
-    <Target Name="BuildForCI" AfterTargets="Build" DependsOnTargets="GetProjectInfo" Condition="'$(ContinuousIntegrationBuild)' == 'True' AND '$(BSMTTaskAssembly)' != ''">
-        <PropertyGroup>
-            <!--Set 'ArtifactName' if it failed before.-->
-            <ArtifactName Condition="'$(ArtifactName)' == ''">$(AssemblyName)</ArtifactName>
-        </PropertyGroup>
-        <Message Text="Building for CI" Importance="high"/>
-        <Message Text="PluginVersion: $(PluginVersion), AssemblyVersion: $(AssemblyVersion), GameVersion: $(GameVersion)" Importance="high"/>
-        <Message Text="::set-output name=filename::$(ArtifactName)" Importance="high"/>
-        <Message Text="::set-output name=assemblyname::$(AssemblyName)" Importance="high"/>
-        <Message Text="::set-output name=artifactpath::$(ProjectDir)$(ArtifactDestination)" Importance="high"/>
-        <Message Text="Copying '$(OutputAssemblyName).dll' to '$(ProjectDir)$(ArtifactDestination)\Plugins\$(AssemblyName).dll'" Importance="high"/>
-        <Copy SourceFiles="$(OutputAssemblyName).dll" DestinationFiles="$(ProjectDir)$(ArtifactDestination)\Plugins\$(AssemblyName).dll"/>
-    </Target>
-    <!--Creates a BeatMods compliant zip file with the release.-->
-    <Target Name="ZipRelease" AfterTargets="Build" Condition="'$(DisableZipRelease)' != 'True' AND '$(Configuration)' == 'Release' AND '$(BSMTTaskAssembly)' != ''">
-        <PropertyGroup>
-            <!--Set 'ArtifactName' if it failed before.-->
-            <ArtifactName Condition="'$(ArtifactName)' == ''">$(AssemblyName)</ArtifactName>
-            <DestinationDirectory>$(OutDir)zip\</DestinationDirectory>
-        </PropertyGroup>
-        <ItemGroup>
-            <OldZips Include="$(DestinationDirectory)$(AssemblyName)*.zip"/>
-        </ItemGroup>
-        <Copy SourceFiles="$(OutputAssemblyName).dll" DestinationFiles="$(ArtifactDestination)\Plugins\$(AssemblyName).dll"/>
-        <Message Text="PluginVersion: $(PluginVersion), AssemblyVersion: $(AssemblyVersion), GameVersion: $(GameVersion)" Importance="high"/>
-        <Delete Files="@(OldZips)" TreatErrorsAsWarnings="true" ContinueOnError="true"/>
-        <ZipDir SourceDirectory="$(ArtifactDestination)" DestinationFile="$(DestinationDirectory)$(ArtifactName).zip"/>
-    </Target>
-    <!--Copies the assembly and pdb to the Beat Saber folder.-->
-    <Target Name="CopyToPlugins" AfterTargets="Build" Condition="'$(DisableCopyToPlugins)' != 'True' AND '$(ContinuousIntegrationBuild)' != 'True'">
-        <PropertyGroup>
-            <PluginDir>$(BeatSaberDir)\Plugins</PluginDir>
-            <CanCopyToPlugins>True</CanCopyToPlugins>
-            <CopyToPluginsError Condition="!Exists('$(PluginDir)')">Unable to copy assembly to game folder, did you set 'BeatSaberDir' correctly in your 'csproj.user' file? Plugins folder doesn't exist: '$(PluginDir)'.</CopyToPluginsError>
-            <!--Error if 'BeatSaberDir' does not have 'Beat Saber.exe'-->
-            <CopyToPluginsError Condition="!Exists('$(BeatSaberDir)\Beat Saber.exe')">Unable to copy to Plugins folder, '$(BeatSaberDir)' does not appear to be a Beat Saber game install.</CopyToPluginsError>
-            <!--Error if 'BeatSaberDir' is the same as 'LocalRefsDir'-->
-            <CopyToPluginsError Condition="'$(BeatSaberDir)' == '$(LocalRefsDir)' OR '$(BeatSaberDir)' == ''">Unable to copy to Plugins folder, 'BeatSaberDir' has not been set in your 'csproj.user' file.</CopyToPluginsError>
-            <CanCopyToPlugins Condition="'$(CopyToPluginsError)' != ''">False</CanCopyToPlugins>
-        </PropertyGroup>
-        <!--Check if Beat Saber is running-->
-        <IsProcessRunning ProcessName="Beat Saber" Condition="'$(BSMTTaskAssembly)' != ''">
-            <Output TaskParameter="IsRunning" PropertyName="IsRunning"/>
-        </IsProcessRunning>
-        <PropertyGroup>
-            <!--If Beat Saber is running, output to the Pending folder-->
-            <PluginDir Condition="'$(IsRunning)' == 'True'">$(BeatSaberDir)\IPA\Pending\Plugins</PluginDir>
-        </PropertyGroup>
-        <Warning Text="$(CopyToPluginsError)" Condition="'$(CopyToPluginsError)' != ''"/>
-        <Message Text="Copying '$(OutputAssemblyName).dll' to '$(PluginDir)'." Importance="high" Condition="$(CanCopyToPlugins)"/>
-        <Copy SourceFiles="$(OutputAssemblyName).dll" DestinationFiles="$(PluginDir)\$(AssemblyName).dll" Condition="$(CanCopyToPlugins)"/>
-        <Copy SourceFiles="$(OutputAssemblyName).pdb" DestinationFiles="$(PluginDir)\$(AssemblyName).pdb" Condition="'$(CanCopyToPlugins)' == 'True' AND Exists('$(OutputAssemblyName).pdb')"/>
-        <Warning Text="Beat Saber is running, restart the game to use the latest build." Condition="'$(IsRunning)' == 'True'"/>
-    </Target>
-</Project>
--- a/Mod/Mod.sln
+++ b/Mod/Mod.sln
@ -13,14 +13,11 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
-		Dev|Any CPU = Dev|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{E8654F87-DB97-4565-8B0C-7C9D55CD6805}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E8654F87-DB97-4565-8B0C-7C9D55CD6805}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E8654F87-DB97-4565-8B0C-7C9D55CD6805}.Dev|Any CPU.ActiveCfg = Dev|Any CPU
-		{E8654F87-DB97-4565-8B0C-7C9D55CD6805}.Dev|Any CPU.Build.0 = Dev|Any CPU
 		{E8654F87-DB97-4565-8B0C-7C9D55CD6805}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E8654F87-DB97-4565-8B0C-7C9D55CD6805}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
--- a/Mod/Plugin.cs
+++ b/Mod/Plugin.cs
@ -34,7 +34,7 @@ namespace ScoreTracker

            Task.Run(async () =>
            {
-                await Request.PostJsonAsync("http://localhost:7500/boobies", new Dictionary<object, object> {
+                await Request.PostJsonAsync("http://localhost:7500/test", new Dictionary<object, object> {
                    { "boobies", "yes" }
                });
            });
--- a/Mod/ScoreTracker.csproj
+++ b/Mod/ScoreTracker.csproj
@ -1,18 +1,43 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
-    <TargetFramework>net48</TargetFramework>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{E8654F87-DB97-4565-8B0C-7C9D55CD6805}</ProjectGuid>
    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>ScoreTracker</RootNamespace>
+    <AssemblyName>ScoreTracker</AssemblyName>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>portable</DebugType>
    <LocalRefsDir Condition="Exists('..\Refs')">..\Refs</LocalRefsDir>
    <BeatSaberDir>$(LocalRefsDir)</BeatSaberDir>
    <AppOutputBase>$(MSBuildProjectDirectory)\</AppOutputBase>
-    <LangVersion>9</LangVersion>
-    <Nullable>enable</Nullable>
+    <!--<PathMap>$(AppOutputBase)=X:\$(AssemblyName)\</PathMap>-->
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
  </PropertyGroup>
-  <PropertyGroup>
-    <Copyright>Copyright © 2023</Copyright>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <WarningLevel>3</WarningLevel>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition="$(DefineConstants.Contains('CIBuild')) OR '$(NCrunch)' == '1'">
+    <DisableCopyToPlugins>True</DisableCopyToPlugins>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(NCrunch)' == '1'">
+    <DisableCopyToPlugins>True</DisableCopyToPlugins>
+    <DisableZipRelease>True</DisableZipRelease>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="BGNet, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" />