Skip to content

Commit

Permalink
Merge pull request #324 from amazingalek/dev
Browse files Browse the repository at this point in the history 
* New "SDK style" projects
* C# 9.0
* .Net Framework 4.7.2 -> 4.8
* Sexy C# 8/9 code
* Fixed OWML Nuget package
  • Loading branch information
@amazingalek
amazingalek authored Dec 20, 2020
2 parents 6832779 + 8e576ab commit 1d68039
Show file tree
Hide file tree
Showing 109 changed files with 747 additions and 3,805 deletions.
12 changes: 5 additions & 7 deletions .github/workflows/main.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,10 @@ jobs:
file: src\SampleMods\OWML.LoadCustomAssets\manifest.json
field: version
value: ${{ steps.version.outputs.prop }}
- name: set assembly version
uses: rshillington/file-content-replacer@master
- name: set project version
uses: roryprimrose/set-vs-sdk-project-version@v1
with:
files: "**/AssemblyInfo.cs"
from: '\[assembly: AssemblyVersion\("[0-9.]*"\)\]'
to: '[assembly: AssemblyVersion("${{ steps.version.outputs.prop }}")]'
version: ${{ steps.version.outputs.prop }}

- name: setup msbuild
uses: microsoft/setup-msbuild@v1
Expand All @@ -62,15 +60,15 @@ jobs:

- name: create zip
run: |
cd src\OWML.Launcher\bin\Debug
cd src\OWML.Launcher\bin\Debug\net48
mkdir Logs
mkdir Mods
7z a OWML.zip *
- name: upload zip
uses: actions/upload-artifact@v2
with:
name: owml-zip
path: src\OWML.Launcher\bin\Debug\OWML.zip
path: src\OWML.Launcher\bin\Debug\net48\OWML.zip

nuget:
runs-on: windows-latest
Expand Down
270 changes: 135 additions & 135 deletions OWML.sln
View file

Large diffs are not rendered by default.

101 changes: 8 additions & 93 deletions src/OWML.Abstractions/OWML.Abstractions.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,97 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{F30E9352-0578-4775-A006-2501FCB35462}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OWML.Abstractions</RootNamespace>
<AssemblyName>OWML.Abstractions</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
<TargetFramework>net35</TargetFramework>
<LangVersion>9.0</LangVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Assembly-CSharp, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\Assembly-CSharp.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="OW.Unity.Dlls, Version=1.0.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\OW.Unity.Dlls.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.AudioModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.AudioModule.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.CoreModule.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.IMGUIModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.IMGUIModule.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.PhysicsModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.PhysicsModule.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.TextRenderingModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.TextRenderingModule.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.UI, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.UI.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.UIModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.UIModule.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.UnityWebRequestWWWModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.UnityWebRequestWWWModule.dll</HintPath>
<Private>False</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="ApplicationHelper.cs" />
<Compile Include="GameObjectHelper.cs" />
<Compile Include="ProcessHelper.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\OWML.Common\OWML.Common.csproj">
<Project>{3C00626F-B688-4F32-B493-5B7EC1C879A0}</Project>
<Name>OWML.Common</Name>
</ProjectReference>
</ItemGroup>

<ItemGroup>
<None Include="packages.config" />
<ProjectReference Include="..\OWML.Common\OWML.Common.csproj" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

</Project>
35 changes: 0 additions & 35 deletions src/OWML.Abstractions/Properties/AssemblyInfo.cs
View file

This file was deleted.

4 changes: 0 additions & 4 deletions src/OWML.Abstractions/packages.config
View file

This file was deleted.

193 changes: 21 additions & 172 deletions src/OWML.Common/OWML.Common.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,172 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{3C00626F-B688-4F32-B493-5B7EC1C879A0}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OWML.Common</RootNamespace>
<AssemblyName>OWML.Common</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Compile Include="Constants.cs" />
<Compile Include="DontDestroyOnLoad.cs" />
<Compile Include="Events.cs" />
<Compile Include="Interfaces\IApplicationHelper.cs" />
<Compile Include="Interfaces\IArgumentHelper.cs" />
<Compile Include="Interfaces\IBinaryPatcher.cs" />
<Compile Include="Interfaces\IBindingChangeListener.cs" />
<Compile Include="Interfaces\IGameObjectHelper.cs" />
<Compile Include="Interfaces\IGameVersionHandler.cs" />
<Compile Include="Interfaces\IGameVersionReader.cs" />
<Compile Include="Interfaces\IHarmonyHelper.cs" />
<Compile Include="Interfaces\IInterfaceProxyFactory.cs" />
<Compile Include="Interfaces\IModAssets.cs" />
<Compile Include="Interfaces\IModAsset.cs" />
<Compile Include="Interfaces\IModInputCombination.cs" />
<Compile Include="Interfaces\IModInputTextures.cs" />
<Compile Include="Interfaces\IModInputHandler.cs" />
<Compile Include="Interfaces\IModInteraction.cs" />
<Compile Include="Interfaces\IModPlayerEvents.cs" />
<Compile Include="Interfaces\IModSceneEvents.cs" />
<Compile Include="Interfaces\IModSocket.cs" />
<Compile Include="Interfaces\IModSorter.cs" />
<Compile Include="Interfaces\IModUnityEvents.cs" />
<Compile Include="Interfaces\IModSocketMessage.cs" />
<Compile Include="Interfaces\IObjImporter.cs" />
<Compile Include="Interfaces\IOWPatcher.cs" />
<Compile Include="Interfaces\IPathFinder.cs" />
<Compile Include="Interfaces\IProcessHelper.cs" />
<Compile Include="Interfaces\ISectorInfo.cs" />
<Compile Include="Interfaces\IUnityLogger.cs" />
<Compile Include="Interfaces\IVRFilePatcher.cs" />
<Compile Include="Interfaces\IVRPatcher.cs" />
<Compile Include="Interfaces\Menus\IModPopupManager.cs" />
<Compile Include="Interfaces\Menus\IModSeparator.cs" />
<Compile Include="Interfaces\Menus\IModInputBase.cs" />
<Compile Include="Interfaces\Menus\IModFieldInput.cs" />
<Compile Include="Interfaces\Menus\IModMessagePopup.cs" />
<Compile Include="Interfaces\Menus\IModMenuWithSelectables.cs" />
<Compile Include="Interfaces\Menus\IModLayoutManager.cs" />
<Compile Include="Interfaces\Menus\IModInputCombinationElementMenu.cs" />
<Compile Include="Interfaces\Menus\IModInputCombinationMenu.cs" />
<Compile Include="Interfaces\Menus\IModInputCombinationElement.cs" />
<Compile Include="Interfaces\Menus\IModConfigMenuBase.cs" />
<Compile Include="Interfaces\Menus\IModButtonBase.cs" />
<Compile Include="Interfaces\Menus\IModLayoutButton.cs" />
<Compile Include="Interfaces\Menus\IModComboInput.cs" />
<Compile Include="Interfaces\Menus\IModOWMenu.cs" />
<Compile Include="Interfaces\Menus\IModPromptButton.cs" />
<Compile Include="Interfaces\Menus\IModSelectorInput.cs" />
<Compile Include="Interfaces\Menus\IModTemporaryPopup.cs" />
<Compile Include="Interfaces\Menus\InputType.cs" />
<Compile Include="Interfaces\Menus\IModButton.cs" />
<Compile Include="Interfaces\IModConfig.cs" />
<Compile Include="Interfaces\IModData.cs" />
<Compile Include="Interfaces\Menus\IModConfigMenu.cs" />
<Compile Include="Interfaces\Menus\IModInput.cs" />
<Compile Include="Interfaces\Menus\IModInputMenu.cs" />
<Compile Include="Interfaces\Menus\IModMainMenu.cs" />
<Compile Include="Interfaces\Menus\IModPauseMenu.cs" />
<Compile Include="Interfaces\Menus\IModsMenu.cs" />
<Compile Include="Interfaces\Menus\IModTabbedMenu.cs" />
<Compile Include="Interfaces\Menus\IModPopupMenu.cs" />
<Compile Include="Interfaces\Menus\IModTabMenu.cs" />
<Compile Include="Interfaces\IOwmlConfig.cs" />
<Compile Include="Interfaces\IModEvents.cs" />
<Compile Include="Interfaces\IModFinder.cs" />
<Compile Include="Interfaces\IModHelper.cs" />
<Compile Include="Interfaces\IModConsole.cs" />
<Compile Include="Interfaces\IModBehaviour.cs" />
<Compile Include="Interfaces\Menus\IModMenu.cs" />
<Compile Include="Interfaces\Menus\IModMenus.cs" />
<Compile Include="Interfaces\IModLogger.cs" />
<Compile Include="Interfaces\IModManifest.cs" />
<Compile Include="Interfaces\IModStorage.cs" />
<Compile Include="Interfaces\Menus\IModSliderInput.cs" />
<Compile Include="Interfaces\Menus\IModNumberInput.cs" />
<Compile Include="Interfaces\Menus\IModTextInput.cs" />
<Compile Include="Interfaces\Menus\IModToggleInput.cs" />
<Compile Include="MessageType.cs" />
<Compile Include="ModManifest.cs" />
<Compile Include="OwmlConfig.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<Reference Include="Assembly-CSharp, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\Assembly-CSharp.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Json.Net.Unity3D.9.0.1\lib\net35\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="OW.Unity.Dlls, Version=1.0.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\OW.Unity.Dlls.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.AudioModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.AudioModule.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.CoreModule.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.IMGUIModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.IMGUIModule.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.PhysicsModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.PhysicsModule.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.TextRenderingModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.TextRenderingModule.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.UI, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.UI.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.UIModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.UIModule.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.UnityWebRequestWWWModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\OW.Unity.Dlls.1.0.8\lib\net35\UnityEngine.UnityWebRequestWWWModule.dll</HintPath>
<Private>False</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net35</TargetFramework>
<LangVersion>9.0</LangVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Json.Net.Unity3D" Version="9.0.1" />
<PackageReference Include="OW.Unity.Dlls" Version="1.0.8">
<ExcludeAssets>runtime</ExcludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<Reference Include="System.Runtime.Serialization">
<Private>true</Private>
</Reference>
</ItemGroup>

</Project>
4 changes: 0 additions & 4 deletions src/OWML.Common/OWML.Common.csproj.DotSettings
View file

This file was deleted.

Loading

0 comments on commit 1d68039

Please sign in to comment.