Browse Source

Pulled out common properties for the projects into common project

pull/94/head
Anairkoen Schno 3 years ago
parent
commit
803e759453
Signed by: DaNike GPG Key ID: BEFB74D5F3FC4387
6 changed files with 35 additions and 13 deletions
  1. +2
    -0
      BSIPA.sln
  2. +4
    -0
      Common.props
  3. +13
    -0
      Common.targets
  4. +6
    -5
      IPA.Injector/IPA.Injector.csproj
  5. +6
    -5
      IPA.Loader/IPA.Loader.csproj
  6. +4
    -3
      IPA/IPA.csproj

+ 2
- 0
BSIPA.sln View File

@ -19,6 +19,8 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4D6639A2-BD39-4F9B-AF7F-8E5F3B88243D}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4D6639A2-BD39-4F9B-AF7F-8E5F3B88243D}"
ProjectSection(SolutionItems) = preProject ProjectSection(SolutionItems) = preProject
.github\workflows\build.yml = .github\workflows\build.yml .github\workflows\build.yml = .github\workflows\build.yml
Common.props = Common.props
Common.targets = Common.targets
.github\workflows\docs.yml = .github\workflows\docs.yml .github\workflows\docs.yml = .github\workflows\docs.yml
README.md = README.md README.md = README.md
.github\release_draft.yml = .github\release_draft.yml .github\release_draft.yml = .github\release_draft.yml


+ 4
- 0
Common.props View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
</Project>

+ 13
- 0
Common.targets View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<PropertyGroup>
<!--<PathMap>$(SolutionDir)=C:\</PathMap>-->
<DebugType>portable</DebugType>
<LangVersion>9</LangVersion>
<NoWarn>CA1031</NoWarn>
<WarningsAsErrors>$(WarningsAsErrors);nullable</WarningsAsErrors>
<Nullable>disable</Nullable>
</PropertyGroup>
</Project>

+ 6
- 5
IPA.Injector/IPA.Injector.csproj View File

@ -1,13 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\Common.props"/>
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>net461;net35</TargetFrameworks> <TargetFrameworks>net461;net35</TargetFrameworks>
<RootNamespace>IPA.Injector</RootNamespace> <RootNamespace>IPA.Injector</RootNamespace>
<!--<PathMap>$(SolutionDir)=C:\</PathMap>-->
<DebugType>portable</DebugType>
<LangVersion>8.0</LangVersion>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<NoWarn>CA1031</NoWarn>
<GenerateDocumentationFile>false</GenerateDocumentationFile> <GenerateDocumentationFile>false</GenerateDocumentationFile>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo> <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<BuildForBeatSaber Condition=" '$(BuildForBeatSaber)' == '' And '$(TargetFramework)' == 'net461' ">true</BuildForBeatSaber> <BuildForBeatSaber Condition=" '$(BuildForBeatSaber)' == '' And '$(TargetFramework)' == 'net461' ">true</BuildForBeatSaber>
@ -103,4 +102,6 @@
<RemoveDir Directories="$(OutputPath)Libraries" /> <RemoveDir Directories="$(OutputPath)Libraries" />
</Target> </Target>
<Import Project="..\Common.targets"/>
</Project> </Project>

+ 6
- 5
IPA.Loader/IPA.Loader.csproj View File

@ -1,13 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\Common.props"/>
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>net461;net35</TargetFrameworks> <TargetFrameworks>net461;net35</TargetFrameworks>
<RootNamespace>IPA</RootNamespace> <RootNamespace>IPA</RootNamespace>
<!--<PathMap>$(SolutionDir)=C:\</PathMap>-->
<DebugType>portable</DebugType>
<LangVersion>8.0</LangVersion>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<NoWarn>CA1031</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile> <GenerateDocumentationFile>true</GenerateDocumentationFile>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo> <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<BuildForBeatSaber Condition=" '$(BuildForBeatSaber)' == '' And '$(TargetFramework)' == 'net461' ">true</BuildForBeatSaber> <BuildForBeatSaber Condition=" '$(BuildForBeatSaber)' == '' And '$(TargetFramework)' == 'net461' ">true</BuildForBeatSaber>
@ -64,4 +63,6 @@
<EmbeddedResource Include="Loader\description.md" /> <EmbeddedResource Include="Loader\description.md" />
</ItemGroup> </ItemGroup>
<Import Project="..\Common.targets"/>
</Project> </Project>

+ 4
- 3
IPA/IPA.csproj View File

@ -1,5 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\Common.props"/>
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFrameworks>net461;netcoreapp3.1</TargetFrameworks> <TargetFrameworks>net461;netcoreapp3.1</TargetFrameworks>
@ -7,14 +9,13 @@
<RootNamespace>IPA</RootNamespace> <RootNamespace>IPA</RootNamespace>
<AssemblyName>IPA</AssemblyName> <AssemblyName>IPA</AssemblyName>
<PathMap>$(SolutionDir)=C:\</PathMap> <PathMap>$(SolutionDir)=C:\</PathMap>
<DebugType>portable</DebugType>
<LangVersion>8.0</LangVersion>
<NoWarn>CA1031</NoWarn>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo> <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles> <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
<GenerateDocumentationFile>false</GenerateDocumentationFile> <GenerateDocumentationFile>false</GenerateDocumentationFile>
<ApplicationIcon>favicon.ico</ApplicationIcon> <ApplicationIcon>favicon.ico</ApplicationIcon>
</PropertyGroup> </PropertyGroup>
<Import Project="..\Common.targets"/>
</Project> </Project>

Loading…
Cancel
Save