ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

s/ProjectDir/MSBuildProjectDirectory/ in MSBuild include files 

I don't think anything was broken, this is just a precaution
This commit is contained in:
YoshiRulz 2023-03-16 10:44:48 +10:00
parent 3c86ec6964
commit 389fd5015f
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
7 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Common.props
View File

@ -1,7 +1,7 @@
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<AnalysisLevel>5</AnalysisLevel> <AnalysisLevel>5</AnalysisLevel>
<CodeAnalysisRuleSet>$(ProjectDir)../../Common.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRuleSet>$(MSBuildProjectDirectory)/../../Common.ruleset</CodeAnalysisRuleSet>
<ContinuousIntegrationBuild Condition=" '$(GITLAB_CI)' != '' Or '$(APPVEYOR)' != '' ">true</ContinuousIntegrationBuild> <ContinuousIntegrationBuild Condition=" '$(GITLAB_CI)' != '' Or '$(APPVEYOR)' != '' ">true</ContinuousIntegrationBuild>
<EnableNETAnalyzers>true</EnableNETAnalyzers> <EnableNETAnalyzers>true</EnableNETAnalyzers>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
@ -35,8 +35,8 @@
<PackageReference Include="Meziantou.Analyzer" Version="1.0.707" PrivateAssets="all" /> <PackageReference Include="Meziantou.Analyzer" Version="1.0.707" PrivateAssets="all" />
<PackageReference Include="Nullable" Version="1.3.1" PrivateAssets="all" /> <PackageReference Include="Nullable" Version="1.3.1" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435" PrivateAssets="all" /><!-- don't forget to update .stylecop.json at the same time --> <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435" PrivateAssets="all" /><!-- don't forget to update .stylecop.json at the same time -->
<Analyzer Include="$(ProjectDir)../../References/BizHawk.Analyzer.dll" /> <Analyzer Include="$(MSBuildProjectDirectory)/../../References/BizHawk.Analyzer.dll" />
<AdditionalFiles Include="$(ProjectDir)../../.stylecop.json" /> <AdditionalFiles Include="$(MSBuildProjectDirectory)/../../.stylecop.json" />
</ItemGroup> </ItemGroup>
<PropertyGroup Condition=" $(IsTargetingNetFramework) "> <PropertyGroup Condition=" $(IsTargetingNetFramework) ">
<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources> <GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>

2
ExternalProjects/AnalyzersCommon.props
View File

@ -11,6 +11,6 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.2" /> <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.2" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.8.0" /> <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.8.0" />
<Compile Include="$(ProjectDir)../AnalyzersCommon/**/*.cs" /> <Compile Include="$(MSBuildProjectDirectory)/../AnalyzersCommon/**/*.cs" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
ExternalProjects/LibCommon.props
View File

@ -7,6 +7,6 @@
<None Remove="*.sh" /> <None Remove="*.sh" />
</ItemGroup> </ItemGroup>
<Target Name="PostBuild" AfterTargets="PostBuildEvent"> <Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Copy SourceFiles="$(OutputPath)$(MSBuildProjectName).dll" DestinationFolder="$(ProjectDir)../../References/" /> <Copy SourceFiles="$(OutputPath)$(MSBuildProjectName).dll" DestinationFolder="$(MSBuildProjectDirectory)/../../References/" />
</Target> </Target>
</Project> </Project>

2
ExternalToolProjects/ExtToolCommon.props
View File

@ -1,7 +1,7 @@
<Project> <Project>
<Import Project="../Common.props" /> <Import Project="../Common.props" />
<PropertyGroup> <PropertyGroup>
<OutputPath>$(ProjectDir)bin/$(Configuration)/</OutputPath> <OutputPath>$(MSBuildProjectDirectory)/bin/$(Configuration)/</OutputPath>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<None Remove="*.sh" /> <None Remove="*.sh" />

16
ExternalToolProjects/NET48ExternalToolForm.targets
View File

@ -3,31 +3,31 @@
<TargetFramework>net48</TargetFramework> <TargetFramework>net48</TargetFramework>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(BIZHAWK_DATA_HOME)' == '' "> <PropertyGroup Condition=" '$(BIZHAWK_DATA_HOME)' == '' ">
<BIZHAWK_DATA_HOME>$(ProjectDir)../../output/</BIZHAWK_DATA_HOME> <BIZHAWK_DATA_HOME>$(MSBuildProjectDirectory)/../../output/</BIZHAWK_DATA_HOME>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="System.Windows.Forms" /> <Reference Include="System.Windows.Forms" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" /> <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
<Reference Include="BizHawk.Client.Common" <Reference Include="BizHawk.Client.Common"
HintPath="$(ProjectDir)../../output/dll/BizHawk.Client.Common.dll" HintPath="$(MSBuildProjectDirectory)/../../output/dll/BizHawk.Client.Common.dll"
Private="true" /> Private="true" />
<Reference Include="BizHawk.Client.EmuHawk" <Reference Include="BizHawk.Client.EmuHawk"
HintPath="$(ProjectDir)../../output/EmuHawk.exe" HintPath="$(MSBuildProjectDirectory)/../../output/EmuHawk.exe"
Private="true" /> Private="true" />
<Reference Include="BizHawk.Common" <Reference Include="BizHawk.Common"
HintPath="$(ProjectDir)../../output/dll/BizHawk.Common.dll" HintPath="$(MSBuildProjectDirectory)/../../output/dll/BizHawk.Common.dll"
Private="true" /> Private="true" />
<Reference Include="BizHawk.Emulation.Common" <Reference Include="BizHawk.Emulation.Common"
HintPath="$(ProjectDir)../../output/dll/BizHawk.Emulation.Common.dll" HintPath="$(MSBuildProjectDirectory)/../../output/dll/BizHawk.Emulation.Common.dll"
Private="true" /> Private="true" />
<Reference Include="BizHawk.Emulation.Cores" <Reference Include="BizHawk.Emulation.Cores"
HintPath="$(ProjectDir)../../output/dll/BizHawk.Emulation.Cores.dll" HintPath="$(MSBuildProjectDirectory)/../../output/dll/BizHawk.Emulation.Cores.dll"
Private="true" /> Private="true" />
<Reference Include="BizHawk.Emulation.DiscSystem" <Reference Include="BizHawk.Emulation.DiscSystem"
HintPath="$(ProjectDir)../../output/dll/BizHawk.Emulation.DiscSystem.dll" HintPath="$(MSBuildProjectDirectory)/../../output/dll/BizHawk.Emulation.DiscSystem.dll"
Private="true" /> Private="true" />
<Reference Include="BizHawk.WinForms.Controls" <Reference Include="BizHawk.WinForms.Controls"
HintPath="$(ProjectDir)../../output/dll/BizHawk.WinForms.Controls.dll" HintPath="$(MSBuildProjectDirectory)/../../output/dll/BizHawk.WinForms.Controls.dll"
Private="true" /> Private="true" />
</ItemGroup> </ItemGroup>
<Target Name="PostBuild" AfterTargets="PostBuildEvent"> <Target Name="PostBuild" AfterTargets="PostBuildEvent">

8
src/MainSlnCommon.props
View File

@ -3,20 +3,20 @@
<PropertyGroup> <PropertyGroup>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath> <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<DefineConstants>$(DefineConstants);AVI_SUPPORT</DefineConstants> <DefineConstants>$(DefineConstants);AVI_SUPPORT</DefineConstants>
<DocumentationFile>$(ProjectDir)bin/doc_comments.xml</DocumentationFile> <DocumentationFile>$(MSBuildProjectDirectory)/bin/doc_comments.xml</DocumentationFile>
<LangVersion>9.0</LangVersion> <LangVersion>9.0</LangVersion>
<MSBuildWarningsAsMessages>NU1702</MSBuildWarningsAsMessages> <MSBuildWarningsAsMessages>NU1702</MSBuildWarningsAsMessages>
<NoWarn>$(NoWarn);CS1573;CS1591</NoWarn> <NoWarn>$(NoWarn);CS1573;CS1591</NoWarn>
<OutputPath>$(ProjectDir)../../output/dll</OutputPath> <OutputPath>$(MSBuildProjectDirectory)/../../output/dll</OutputPath>
<ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch> <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(MachineRunAnalyzersDuringBuild)' == '' "> <PropertyGroup Condition=" '$(MachineRunAnalyzersDuringBuild)' == '' ">
<RunAnalyzersDuringBuild>false</RunAnalyzersDuringBuild> <RunAnalyzersDuringBuild>false</RunAnalyzersDuringBuild>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Analyzer Include="$(ProjectDir)../../References/BizHawk.SrcGen.ReflectionCache.dll" /> <Analyzer Include="$(MSBuildProjectDirectory)/../../References/BizHawk.SrcGen.ReflectionCache.dll" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '$(Configuration)' != 'Debug' "> <ItemGroup Condition=" '$(Configuration)' != 'Debug' ">
<Compile Remove="$(ProjectDir)debug/**/*" /> <Compile Remove="$(MSBuildProjectDirectory)/debug/**/*" />
</ItemGroup> </ItemGroup>
</Project> </Project>

4
src/MainSlnExecutable.props
View File

@ -2,7 +2,7 @@
<Import Project="MainSlnCommon.props" /> <Import Project="MainSlnCommon.props" />
<PropertyGroup> <PropertyGroup>
<DefineConstants>$(DefineConstants);EXE_PROJECT</DefineConstants> <DefineConstants>$(DefineConstants);EXE_PROJECT</DefineConstants>
<OutputPath>$(ProjectDir)../../output</OutputPath> <OutputPath>$(MSBuildProjectDirectory)/../../output</OutputPath>
<TargetName>$(MSBuildProjectName.Substring($([MSBuild]::Add($(MSBuildProjectName.LastIndexOf('.')), 1))))</TargetName> <TargetName>$(MSBuildProjectName.Substring($([MSBuild]::Add($(MSBuildProjectName.LastIndexOf('.')), 1))))</TargetName>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' "> <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
@ -12,7 +12,7 @@
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Compile Include="$(ProjectDir)../BizHawk.Common/OSTailoredCode.cs" /> <Compile Include="$(MSBuildProjectDirectory)/../BizHawk.Common/OSTailoredCode.cs" />
</ItemGroup> </ItemGroup>
<Target Name="PostBuild" AfterTargets="PostBuildEvent"> <Target Name="PostBuild" AfterTargets="PostBuildEvent">
<ItemGroup> <ItemGroup>