Skip to content

Commit 433f3af

Browse files
AzyyyyyyAzyyyyyy
committed
Move common ItemGroup/PropertyGroup's into it's own file and import the file
This allows us to ensure UWP and normal projects aren't out of sync
1 parent f9f57d8 commit 433f3af

File tree

4 files changed

+52
-155
lines changed

4 files changed

+52
-155
lines changed

‎src/MultiRPC.UWP/MultiRPC.UWP.Package.wapproj‎

Lines changed: 1 addition & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@
88
<Configuration>Debug</Configuration>
99
<Platform>x86</Platform>
1010
</ProjectConfiguration>
11-
<ProjectConfiguration Include="WINSTORE|x86">
12-
<Configuration>WINSTORE</Configuration>
13-
<Platform>x86</Platform>
14-
</ProjectConfiguration>
1511
<ProjectConfiguration Include="Release|x86">
1612
<Configuration>Release</Configuration>
1713
<Platform>x86</Platform>
@@ -24,10 +20,6 @@
2420
<Configuration>Release</Configuration>
2521
<Platform>x64</Platform>
2622
</ProjectConfiguration>
27-
<ProjectConfiguration Include="WINSTORE|x64">
28-
<Configuration>WINSTORE</Configuration>
29-
<Platform>x64</Platform>
30-
</ProjectConfiguration>
3123
<ProjectConfiguration Include="Debug|ARM">
3224
<Configuration>Debug</Configuration>
3325
<Platform>ARM</Platform>
@@ -36,10 +28,6 @@
3628
<Configuration>Release</Configuration>
3729
<Platform>ARM</Platform>
3830
</ProjectConfiguration>
39-
<ProjectConfiguration Include="WINSTORE|ARM">
40-
<Configuration>WINSTORE</Configuration>
41-
<Platform>ARM</Platform>
42-
</ProjectConfiguration>
4331
<ProjectConfiguration Include="Debug|ARM64">
4432
<Configuration>Debug</Configuration>
4533
<Platform>ARM64</Platform>
@@ -48,10 +36,6 @@
4836
<Configuration>Release</Configuration>
4937
<Platform>ARM64</Platform>
5038
</ProjectConfiguration>
51-
<ProjectConfiguration Include="WINSTORE|ARM64">
52-
<Configuration>WINSTORE</Configuration>
53-
<Platform>ARM64</Platform>
54-
</ProjectConfiguration>
5539
<ProjectConfiguration Include="Debug|AnyCPU">
5640
<Configuration>Debug</Configuration>
5741
<Platform>AnyCPU</Platform>
@@ -60,10 +44,6 @@
6044
<Configuration>Release</Configuration>
6145
<Platform>AnyCPU</Platform>
6246
</ProjectConfiguration>
63-
<ProjectConfiguration Include="WINSTORE|AnyCPU">
64-
<Configuration>WINSTORE</Configuration>
65-
<Platform>AnyCPU</Platform>
66-
</ProjectConfiguration>
6747
</ItemGroup>
6848
<PropertyGroup>
6949
<WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>
@@ -85,53 +65,7 @@
8565
<AppxBundlePlatforms>x86|x64|arm|arm64</AppxBundlePlatforms>
8666
<PackageCertificateThumbprint>11B1263E797F2500D079382148EBFA4669720245</PackageCertificateThumbprint>
8767
<EntryPointProjectUniqueName>..\MultiRPC\MultiRPC.UWP.csproj</EntryPointProjectUniqueName>
88-
</PropertyGroup>
89-
<PropertyGroup Condition="'$(Configuration)'=='WINSTORE'">
90-
</PropertyGroup>
91-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
92-
<AppxBundle>Never</AppxBundle>
93-
</PropertyGroup>
94-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
95-
<AppxBundle>Always</AppxBundle>
96-
</PropertyGroup>
97-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
98-
<AppxBundle>Never</AppxBundle>
99-
</PropertyGroup>
100-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='WINSTORE|ARM64'">
101-
<AppxBundle>Never</AppxBundle>
102-
</PropertyGroup>
103-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
104-
<AppxBundle>Never</AppxBundle>
105-
</PropertyGroup>
106-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
107-
<AppxBundle>Never</AppxBundle>
108-
</PropertyGroup>
109-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
110-
<AppxBundle>Never</AppxBundle>
111-
</PropertyGroup>
112-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='WINSTORE|x86'">
113-
<AppxBundle>Never</AppxBundle>
114-
</PropertyGroup>
115-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
116-
<AppxBundle>Never</AppxBundle>
117-
</PropertyGroup>
118-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='WINSTORE|AnyCPU'">
119-
<AppxBundle>Never</AppxBundle>
120-
</PropertyGroup>
121-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
122-
<AppxBundle>Never</AppxBundle>
123-
</PropertyGroup>
124-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='WINSTORE|x64'">
125-
<AppxBundle>Never</AppxBundle>
126-
</PropertyGroup>
127-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
128-
<AppxBundle>Never</AppxBundle>
129-
</PropertyGroup>
130-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='WINSTORE|ARM'">
131-
<AppxBundle>Never</AppxBundle>
132-
</PropertyGroup>
133-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
134-
<AppxBundle>Never</AppxBundle>
68+
<AppxBundle>Never</AppxBundle>
13569
</PropertyGroup>
13670
<ItemGroup>
13771
<AppxManifest Include="Package.appxmanifest">

‎src/MultiRPC/MultiRPC.Base.csproj‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
<Project>
2+
<PropertyGroup>
3+
<OutputType>WinExe</OutputType>
4+
<ApplicationIcon>Assets/Logo.ico</ApplicationIcon>
5+
<LangVersion>preview</LangVersion>
6+
<Nullable>enable</Nullable>
7+
<EnablePreviewFeatures>true</EnablePreviewFeatures>
8+
<Version>7.0.0</Version>
9+
</PropertyGroup>
10+
11+
12+
<PropertyGroup Condition="'$(Configuration)'=='Release'">
13+
<PublishTrimmed>true</PublishTrimmed>
14+
<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
15+
<DebuggerSupport>false</DebuggerSupport>
16+
<_AggressiveAttributeTrimming>true</_AggressiveAttributeTrimming>
17+
<AutoreleasePoolSupport>true</AutoreleasePoolSupport>
18+
<VerifyDependencyInjectionOpenGenericServiceTrimmability>true</VerifyDependencyInjectionOpenGenericServiceTrimmability>
19+
</PropertyGroup>
20+
21+
<ItemGroup Label="Packages">
22+
<PackageReference Include="Avalonia.Desktop" Version="0.10.12" />
23+
<PackageReference Include="Avalonia.Svg" Version="0.10.12" />
24+
<PackageReference Include="AvaloniaColorPicker" Version="1.2.0" />
25+
<PackageReference Include="Splat" Version="14.1.45" />
26+
<PackageReference Include="System.IO.Pipelines" Version="6.0.2" />
27+
<PackageReference Include="System.Text.Json" Version="6.0.2" />
28+
<PackageReference Include="TinyUpdate.Binary" Version="0.0.0.10-alpha" />
29+
<PackageReference Include="TinyUpdate.Github" Version="0.0.0.10-alpha" />
30+
<PackageReference Include="XamlNameReferenceGenerator" Version="1.3.4" />
31+
<ProjectReference Include="..\..\ext\avalonia.gif\AvaloniaGif\AvaloniaGif.csproj" />
32+
<ProjectReference Include="..\..\ext\discord-rpc-csharp\DiscordRPC\DiscordRPC.csproj" />
33+
<ProjectReference Include="..\..\ext\fonderie\Fonderie.INPC\Fonderie.INPC.Generator\Fonderie.INPC.Generator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
34+
<ProjectReference Include="..\MultiRPC.SourceGen\MultiRPC.SourceGen.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
35+
</ItemGroup>
36+
37+
<ItemGroup Condition="'$(Configuration)'=='Debug'" Label="Debug Packages">
38+
<PackageReference Include="Avalonia.Diagnostics" Version="0.10.12" />
39+
</ItemGroup>
40+
41+
<ItemGroup Label="Resources">
42+
<AvaloniaResource Include="Assets\**" />
43+
<AvaloniaResource Remove="Assets\Language\**" />
44+
<Content Include="Assets\Language\**" CopyToOutputDirectory="Always" />
45+
<AdditionalFiles Include="Assets\Language\en-gb.json" />
46+
</ItemGroup>
47+
</Project>

‎src/MultiRPC/MultiRPC.UWP.csproj‎

Lines changed: 3 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
<Import Project="..\MultiRPC\MultiRPC.Base.csproj" />
23
<PropertyGroup>
3-
<OutputType>WinExe</OutputType>
4+
<RootNamespace>MultiRPC</RootNamespace>
5+
<AssemblyName>MultiRPC</AssemblyName>
46
<TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
5-
<ApplicationIcon>Assets/Logo.ico</ApplicationIcon>
6-
<LangVersion>preview</LangVersion>
7-
<Nullable>enable</Nullable>
8-
<EnablePreviewFeatures>true</EnablePreviewFeatures>
9-
<Version>7.0.0</Version>
10-
<RootNamespace>MultiRPC</RootNamespace>
11-
<AssemblyName>MultiRPC</AssemblyName>
127
<DefineConstants>$(DefineConstants);_UWP</DefineConstants>
138
</PropertyGroup>
14-
15-
<PropertyGroup>
16-
<PublishTrimmed>true</PublishTrimmed>
17-
<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
18-
<DebuggerSupport>false</DebuggerSupport>
19-
<_AggressiveAttributeTrimming>true</_AggressiveAttributeTrimming>
20-
<AutoreleasePoolSupport>true</AutoreleasePoolSupport>
21-
<VerifyDependencyInjectionOpenGenericServiceTrimmability>true</VerifyDependencyInjectionOpenGenericServiceTrimmability>
22-
</PropertyGroup>
23-
24-
<ItemGroup Label="Packages">
25-
<PackageReference Include="Avalonia.Desktop" Version="0.10.12" />
26-
<PackageReference Include="Avalonia.Svg" Version="0.10.12" />
27-
<PackageReference Include="AvaloniaColorPicker" Version="1.2.0" />
28-
<PackageReference Include="Splat" Version="14.1.45" />
29-
<PackageReference Include="System.IO.Pipelines" Version="6.0.2" />
30-
<PackageReference Include="System.Text.Json" Version="6.0.2" />
31-
<PackageReference Include="TinyUpdate.Binary" Version="0.0.0.10-alpha" />
32-
<PackageReference Include="TinyUpdate.Github" Version="0.0.0.10-alpha" />
33-
<PackageReference Include="XamlNameReferenceGenerator" Version="1.3.4" />
34-
<ProjectReference Include="..\..\ext\avalonia.gif\AvaloniaGif\AvaloniaGif.csproj" />
35-
<ProjectReference Include="..\..\ext\discord-rpc-csharp\DiscordRPC\DiscordRPC.csproj" />
36-
<ProjectReference Include="..\..\ext\fonderie\Fonderie.INPC\Fonderie.INPC.Generator\Fonderie.INPC.Generator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
37-
<ProjectReference Include="..\MultiRPC.SourceGen\MultiRPC.SourceGen.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
38-
</ItemGroup>
39-
40-
<ItemGroup Condition="'$(Configuration)'=='Debug'" Label="Debug Packages">
41-
<PackageReference Include="Avalonia.Diagnostics" Version="0.10.12" />
42-
</ItemGroup>
43-
44-
<ItemGroup Label="Resources">
45-
<AvaloniaResource Include="Assets\**" />
46-
47-
<AvaloniaResource Remove="Assets\Language\**" />
48-
<Content Include="Assets\Language\**" CopyToOutputDirectory="Always" />
49-
<AdditionalFiles Include="Assets\Language\en-gb.json" />
50-
</ItemGroup>
519
</Project>

‎src/MultiRPC/MultiRPC.csproj‎

Lines changed: 1 addition & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
<Import Project="..\MultiRPC\MultiRPC.Base.csproj" />
23
<PropertyGroup>
3-
<OutputType>WinExe</OutputType>
44
<TargetFramework>net6.0</TargetFramework>
5-
<ApplicationIcon>Assets/Logo.ico</ApplicationIcon>
6-
<LangVersion>preview</LangVersion>
7-
<Nullable>enable</Nullable>
8-
<EnablePreviewFeatures>true</EnablePreviewFeatures>
9-
<Version>7.0.0</Version>
105
</PropertyGroup>
11-
12-
13-
<PropertyGroup Condition="'$(Configuration)'=='Release'">
14-
<PublishTrimmed>true</PublishTrimmed>
15-
<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
16-
<DebuggerSupport>false</DebuggerSupport>
17-
<_AggressiveAttributeTrimming>true</_AggressiveAttributeTrimming>
18-
<AutoreleasePoolSupport>true</AutoreleasePoolSupport>
19-
<VerifyDependencyInjectionOpenGenericServiceTrimmability>true</VerifyDependencyInjectionOpenGenericServiceTrimmability>
20-
</PropertyGroup>
21-
22-
<ItemGroup Label="Packages">
23-
<PackageReference Include="Avalonia.Desktop" Version="0.10.12" />
24-
<PackageReference Include="Avalonia.Svg" Version="0.10.12" />
25-
<PackageReference Include="AvaloniaColorPicker" Version="1.2.0" />
26-
<PackageReference Include="Splat" Version="14.1.45" />
27-
<PackageReference Include="System.IO.Pipelines" Version="6.0.2" />
28-
<PackageReference Include="System.Text.Json" Version="6.0.2" />
29-
<PackageReference Include="TinyUpdate.Binary" Version="0.0.0.10-alpha" />
30-
<PackageReference Include="TinyUpdate.Github" Version="0.0.0.10-alpha" />
31-
<PackageReference Include="XamlNameReferenceGenerator" Version="1.3.4" />
32-
<ProjectReference Include="..\..\ext\avalonia.gif\AvaloniaGif\AvaloniaGif.csproj" />
33-
<ProjectReference Include="..\..\ext\discord-rpc-csharp\DiscordRPC\DiscordRPC.csproj" />
34-
<ProjectReference Include="..\..\ext\fonderie\Fonderie.INPC\Fonderie.INPC.Generator\Fonderie.INPC.Generator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
35-
<ProjectReference Include="..\MultiRPC.SourceGen\MultiRPC.SourceGen.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
36-
</ItemGroup>
37-
38-
<ItemGroup Condition="'$(Configuration)'=='Debug'" Label="Debug Packages">
39-
<PackageReference Include="Avalonia.Diagnostics" Version="0.10.12" />
40-
</ItemGroup>
41-
42-
<ItemGroup Label="Resources">
43-
<AvaloniaResource Include="Assets\**" />
44-
<AvaloniaResource Remove="Assets\Language\**" />
45-
<Content Include="Assets\Language\**" CopyToOutputDirectory="Always" />
46-
<AdditionalFiles Include="Assets\Language\en-gb.json" />
47-
</ItemGroup>
486
</Project>

0 commit comments

Comments
 (0)