Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Seperate monolithic Common project into individual subprojects. #499

Merged
merged 4 commits into from
Sep 19, 2023
Merged

Seperate monolithic Common project into individual subprojects. #499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ee4562b
Adust file naming to be consistent with how it's referenced.
orendain Sep 19, 2023
687cbcf
Seperate monolithic `Common` project into individual subprojects.
orendain Sep 19, 2023
3987316
Modify labeller.
orendain Sep 19, 2023
8480a4e
Merge branch 'main' into eo/encapsulate-common-ui
orendain Sep 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/labeler.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
- .github/workflows/advancedstats.yml
- AdvancedStats/**

'area: common':
- Common/**
'area: common/ui':
- Common.UI/**

'area: highlighter':
- .github/workflows/highlighter.yml
Expand Down
21 changes: 10 additions & 11 deletions Common/Common.csproj → Common.UI/Common.UI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Common</RootNamespace>
<AssemblyName>Common</AssemblyName>
<AssemblyName>Common.UI</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
Expand Down Expand Up @@ -68,17 +68,16 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Element\HangoutsElementCreator.cs" />
<Compile Include="Element\IElementCreator.cs" />
<Compile Include="Element\NonVrElementCreator.cs" />
<Compile Include="Element\VrElementCreator.cs" />
<Compile Include="Environments.cs" />
<Compile Include="PageStack.cs" />
<Compile Include="PageStackNavigation.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="CommonModule.cs" />
<Compile Include="UI\PageStack.cs" />
<Compile Include="UI\Element\HangoutsElementCreator.cs" />
<Compile Include="UI\Element\IElementCreator.cs" />
<Compile Include="UI\Element\NonVrElementCreator.cs" />
<Compile Include="UI\Element\VrElementCreator.cs" />
<Compile Include="UI\PageStackNavigation.cs" />
<Compile Include="UI\Resource\NonVrResourceTable.cs" />
<Compile Include="UI\Resource\VrResourceTable.cs" />
<Compile Include="UI\Environments.cs" />
<Compile Include="Resource\NonVrResourceTable.cs" />
<Compile Include="Resource\VrResourceTable.cs" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
0 Common/UI/Element/HangoutsElementCreator.cs → Common.UI/Element/HangoutsElementCreator.cs
View file
Open in desktop
File renamed without changes.
0 Common/UI/Element/IElementCreator.cs → Common.UI/Element/IElementCreator.cs
View file
Open in desktop
File renamed without changes.
0 Common/UI/Element/NonVrElementCreator.cs → Common.UI/Element/NonVrElementCreator.cs
View file
Open in desktop
File renamed without changes.
0 Common/UI/Element/VrElementCreator.cs → Common.UI/Element/VrElementCreator.cs
View file
Open in desktop
File renamed without changes.
0 Common/UI/Environments.cs → Common.UI/Environments.cs
View file
Open in desktop
File renamed without changes.
0 Common/UI/PageStack.cs → Common.UI/PageStack.cs
View file
Open in desktop
File renamed without changes.
0 Common/UI/PageStackNavigation.cs → Common.UI/PageStackNavigation.cs
View file
Open in desktop
File renamed without changes.
0 Common/Properties/AssemblyInfo.cs → Common.UI/Properties/AssemblyInfo.cs
View file
Open in desktop
File renamed without changes.
0 Common/UI/Resource/NonVrResourceTable.cs → Common.UI/Resource/NonVrResourceTable.cs
View file
Open in desktop
File renamed without changes.
0 Common/UI/Resource/VrResourceTable.cs → Common.UI/Resource/VrResourceTable.cs
View file
Open in desktop
File renamed without changes.
9 changes: 0 additions & 9 deletions Common/CommonModule.cs
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion DemeoMods.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.3.32811.315
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common", "Common\Common.csproj", "{45B0C288-5514-4914-92BB-2FCF1E696C28}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common.UI", "Common.UI\Common.UI.csproj", "{45B0C288-5514-4914-92BB-2FCF1E696C28}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RoomFinder", "RoomFinder\RoomFinder.csproj", "{5D106A6F-2A66-4731-877A-3C315F0CB18C}"
EndProject
Expand Down
4 changes: 2 additions & 2 deletions HouseRules_Configuration/HouseRules_Configuration.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@
<Compile Include="ConfigurationMod.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ExampleRulesetExporter.cs" />
<Compile Include="..\Common\**\*.cs" Exclude="..\Common\Properties\AssemblyInfo.cs;..\Common\bin\**\*.*;..\Common\obj\**\*.*;..\Common\**\*.csproj;..\Common\**\*.user;..\Common\**\*.vstemplate">
<Link>Common\%(RecursiveDir)%(Filename)%(Extension)</Link>
<Compile Include="..\Common.UI\**\*.cs" Exclude="..\Common.UI\Properties\AssemblyInfo.cs;..\Common.UI\bin\**\*.*;..\Common.UI\obj\**\*.*;..\Common.UI\**\*.csproj;..\Common.UI\**\*.user;..\Common.UI\**\*.vstemplate">
<Link>Common.UI\%(RecursiveDir)%(Filename)%(Extension)</Link>
</Compile>
<Compile Include="UI\HouseRulesUiGameVr.cs" />
<Compile Include="UI\HouseRulesUiHangouts.cs" />
Expand Down
4 changes: 2 additions & 2 deletions RoomFinder/RoomFinder.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@
<Compile Include="UI\RoomFinderUiNonVr.cs" />
<Compile Include="UI\RoomListPanelVr.cs" />
<Compile Include="UI\RoomFinderUiVr.cs" />
<Compile Include="..\Common\**\*.cs" Exclude="..\Common\Properties\AssemblyInfo.cs;..\Common\bin\**\*.*;..\Common\obj\**\*.*;..\Common\**\*.csproj;..\Common\**\*.user;..\Common\**\*.vstemplate">
<Link>Common\%(RecursiveDir)%(Filename)%(Extension)</Link>
<Compile Include="..\Common.UI\**\*.cs" Exclude="..\Common.UI\Properties\AssemblyInfo.cs;..\Common.UI\bin\**\*.*;..\Common.UI\obj\**\*.*;..\Common.UI\**\*.csproj;..\Common.UI\**\*.user;..\Common.UI\**\*.vstemplate">
<Link>Common.UI\%(RecursiveDir)%(Filename)%(Extension)</Link>
</Compile>
<Compile Include="UI\RoomListPanelNonVr.cs" />
</ItemGroup>
Expand Down