Skip to content

Commit

Permalink
Attempt to fix merge mess
Browse files Browse the repository at this point in the history
  • Loading branch information
@ManlyMarco
ManlyMarco committed Aug 12, 2021
1 parent cdff303 commit 89a2ee3
Show file tree
Hide file tree
Showing 12 changed files with 3 additions and 25 deletions.
4 changes: 0 additions & 4 deletions src/AI_BrowserFolders/AI_BrowserFolders.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,6 @@
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
<ItemGroup>
<Analyzer Include="..\packages\BepInEx.Analyzers.1.0.4\analyzers\dotnet\cs\BepInEx.Analyzers.CodeFixes.dll" />
<Analyzer Include="..\packages\BepInEx.Analyzers.1.0.4\analyzers\dotnet\cs\BepInEx.Analyzers.dll" />
</ItemGroup>
<Import Project="..\Common_AIHS2\Common_AIHS2.projitems" Label="Shared" />
<Import Project="..\Common\Common.projitems" Label="Shared" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Expand Down
1 change: 0 additions & 1 deletion src/AI_BrowserFolders/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="BepInEx.Analyzers" version="1.0.4" targetFramework="net46" developmentDependency="true" />
<package id="ExtensibleSaveFormat.AIGirl" version="16.3.0" targetFramework="net46" developmentDependency="true" />
<package id="IllusionLibs.AIGirl.Assembly-CSharp" version="2020.5.29.4" targetFramework="net46" developmentDependency="true" />
<package id="IllusionLibs.AIGirl.Assembly-CSharp-firstpass" version="2020.5.29.4" targetFramework="net46" developmentDependency="true" />
Expand Down
4 changes: 0 additions & 4 deletions src/EC_BrowserFolders/EC_BrowserFolders.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,6 @@
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
<ItemGroup>
<Analyzer Include="..\packages\BepInEx.Analyzers.1.0.4\analyzers\dotnet\cs\BepInEx.Analyzers.CodeFixes.dll" />
<Analyzer Include="..\packages\BepInEx.Analyzers.1.0.4\analyzers\dotnet\cs\BepInEx.Analyzers.dll" />
</ItemGroup>
<Import Project="..\Common\Common.projitems" Label="Shared" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\IllusionLibs.BepInEx.Harmony.2.5.2\build\IllusionLibs.BepInEx.Harmony.targets" Condition="Exists('..\packages\IllusionLibs.BepInEx.Harmony.2.5.2\build\IllusionLibs.BepInEx.Harmony.targets')" />
Expand Down
1 change: 0 additions & 1 deletion src/EC_BrowserFolders/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="BepInEx.Analyzers" version="1.0.4" targetFramework="net46" developmentDependency="true" />
<package id="ExtensibleSaveFormat.EmotionCreators" version="16.3.0" targetFramework="net46" developmentDependency="true" />
<package id="IllusionLibs.BepInEx" version="5.4.13" targetFramework="net46" developmentDependency="true" />
<package id="IllusionLibs.BepInEx.Harmony" version="2.5.2" targetFramework="net46" developmentDependency="true" />
Expand Down
4 changes: 0 additions & 4 deletions src/HS2_BrowserFolders/HS2_BrowserFolders.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,10 +106,6 @@
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
<ItemGroup>
<Analyzer Include="..\packages\BepInEx.Analyzers.1.0.4\analyzers\dotnet\cs\BepInEx.Analyzers.CodeFixes.dll" />
<Analyzer Include="..\packages\BepInEx.Analyzers.1.0.4\analyzers\dotnet\cs\BepInEx.Analyzers.dll" />
</ItemGroup>
<Import Project="..\Common_AIHS2\Common_AIHS2.projitems" Label="Shared" />
<Import Project="..\Common\Common.projitems" Label="Shared" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Expand Down
1 change: 0 additions & 1 deletion src/HS2_BrowserFolders/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="BepInEx.Analyzers" version="1.0.4" targetFramework="net46" developmentDependency="true" />
<package id="ExtensibleSaveFormat.HoneySelect2" version="16.3.0" targetFramework="net46" developmentDependency="true" />
<package id="IllusionLibs.BepInEx" version="5.4.13" targetFramework="net46" developmentDependency="true" />
<package id="IllusionLibs.BepInEx.Harmony" version="2.5.2" targetFramework="net46" developmentDependency="true" />
Expand Down
2 changes: 0 additions & 2 deletions src/KK_FolderBrowser/KK_BrowserFolders.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,6 @@
<Folder Include="Properties\" />
</ItemGroup>
<ItemGroup>
<Analyzer Include="..\packages\BepInEx.Analyzers.1.0.4\analyzers\dotnet\cs\BepInEx.Analyzers.CodeFixes.dll" />
<Analyzer Include="..\packages\BepInEx.Analyzers.1.0.4\analyzers\dotnet\cs\BepInEx.Analyzers.dll" />
<Analyzer Include="..\packages\KoikatuCompatibilityAnalyzer.1.0.1\analyzers\dotnet\cs\KoikatuCompatibilityAnalyzer.dll" />
</ItemGroup>
<Import Project="..\Common\Common.projitems" Label="Shared" />
Expand Down
1 change: 0 additions & 1 deletion src/KK_FolderBrowser/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="BepInEx.Analyzers" version="1.0.4" targetFramework="net35" developmentDependency="true" />
<package id="ExtensibleSaveFormat.Koikatu" version="16.3.0" targetFramework="net35" developmentDependency="true" />
<package id="IllusionLibs.BepInEx" version="5.4.13" targetFramework="net35" developmentDependency="true" />
<package id="IllusionLibs.BepInEx.Harmony" version="2.5.2" targetFramework="net35" />
Expand Down
3 changes: 1 addition & 2 deletions src/KK_Hooks_KK/KK_BrowserFolders_Hooks_KK.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@
<ItemGroup>
<Compile Include="ClassroomFolders.cs" />
<Compile Include="FreeHFolders.cs" />
<Compile Include="GlobalSuppressions.cs" />
<Compile Include="HOutfitFolders.cs" />
<Compile Include="MakerOutfitFolders.cs" />
<Compile Include="MakerFolders.cs" />
Expand All @@ -98,8 +99,6 @@
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Analyzer Include="..\packages\BepInEx.Analyzers.1.0.4\analyzers\dotnet\cs\BepInEx.Analyzers.CodeFixes.dll" />
<Analyzer Include="..\packages\BepInEx.Analyzers.1.0.4\analyzers\dotnet\cs\BepInEx.Analyzers.dll" />
<Analyzer Include="..\packages\KoikatuCompatibilityAnalyzer.1.0.1\analyzers\dotnet\cs\KoikatuCompatibilityAnalyzer.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Expand Down
1 change: 0 additions & 1 deletion src/KK_Hooks_KK/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="BepInEx.Analyzers" version="1.0.4" targetFramework="net35" developmentDependency="true" />
<package id="ExtensibleSaveFormat.Koikatu" version="16.3.0" targetFramework="net35" developmentDependency="true" />
<package id="IllusionLibs.BepInEx" version="5.4.13" targetFramework="net35" developmentDependency="true" />
<package id="IllusionLibs.BepInEx.Harmony" version="2.5.2" targetFramework="net35" developmentDependency="true" />
Expand Down
3 changes: 1 addition & 2 deletions src/KK_Hooks_KKP/KK_BrowserFolders_Hooks_KKP.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
<ItemGroup>
<Compile Include="ClassroomFolders.cs" />
<Compile Include="FreeHFolders.cs" />
<Compile Include="GlobalSuppressions.cs" />
<Compile Include="HOutfitFolders.cs" />
<Compile Include="MakerOutfitFolder.cs" />
<Compile Include="MakerFolders.cs" />
Expand All @@ -95,8 +96,6 @@
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Analyzer Include="..\packages\BepInEx.Analyzers.1.0.4\analyzers\dotnet\cs\BepInEx.Analyzers.CodeFixes.dll" />
<Analyzer Include="..\packages\BepInEx.Analyzers.1.0.4\analyzers\dotnet\cs\BepInEx.Analyzers.dll" />
<Analyzer Include="..\packages\KoikatuCompatibilityAnalyzer.1.0.1\analyzers\dotnet\cs\KoikatuCompatibilityAnalyzer.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Expand Down
3 changes: 1 addition & 2 deletions src/KK_Hooks_KKP/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="BepInEx.Analyzers" version="1.0.4" targetFramework="net35" developmentDependency="true" />
<package id="ExtensibleSaveFormat.Koikatu" version="16.3.0" targetFramework="net35" developmentDependency="true" />
<package id="IllusionLibs.BepInEx" version="5.4.13" targetFramework="net35" developmentDependency="true" />
<package id="IllusionLibs.BepInEx.Harmony" version="2.5.2" targetFramework="net35" developmentDependency="true" />
<package id="IllusionLibs.KoikatsuParty.Assembly-CSharp" version="2019.4.27.4" targetFramework="net35" />
<package id="IllusionLibs.Koikatu.Assembly-CSharp" version="2019.4.27" targetFramework="net35" developmentDependency="true" />
<package id="IllusionLibs.Koikatu.Assembly-CSharp-firstpass" version="2019.4.27.4" targetFramework="net35" developmentDependency="true" />
<package id="IllusionLibs.Koikatu.UnityEngine" version="5.6.2.4" targetFramework="net35" developmentDependency="true" />
<package id="IllusionLibs.Koikatu.UnityEngine.UI" version="5.6.2.4" targetFramework="net35" developmentDependency="true" />
<package id="IllusionModdingAPI.KKAPI" version="1.20.3" targetFramework="net35" developmentDependency="true" />
<package id="KoikatuCompatibilityAnalyzer" version="1.0.1" targetFramework="net35" developmentDependency="true" />
<package id="IllusionLibs.KoikatsuParty.Assembly-CSharp" version="2019.4.27.4" targetFramework="net35" developmentDependency="true" />
</packages>

0 comments on commit 89a2ee3

Please sign in to comment.