Skip to content

Commit

Permalink
Tweaks for consistent strong-naming.
Browse files Browse the repository at this point in the history
Also, reduced the number of targets required.
  • Loading branch information
willson556 committed Jun 10, 2020
1 parent 3708dbe commit 9d61434
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 22 deletions.
19 changes: 2 additions & 17 deletions src/Caliburn.Micro.Core/Caliburn.Micro.Core.csproj
Original file line number Diff line number Diff line change
@@ -1,31 +1,16 @@
<Project Sdk="MSBuild.Sdk.Extras">

<PropertyGroup>
<TargetFrameworks>netstandard1.1;</TargetFrameworks>
<TargetFrameworks>netstandard1.1;uap10.0.16299</TargetFrameworks>
<PackageId>Caliburn.Micro.Core</PackageId>
<Product>Caliburn.Micro Core</Product>
<RootNamespace>Caliburn.Micro</RootNamespace>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'net45'">
<AssemblyOriginatorKeyFile>.\..\Caliburn.Micro.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
</PropertyGroup>

<ItemGroup Condition="$(TargetFramework.StartsWith('netstandard'))">
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
</ItemGroup>

<ItemGroup Condition="$(TargetFramework.StartsWith('MonoAndroid'))">
<Reference Include="System.Runtime.Serialization" />
</ItemGroup>

<PropertyGroup Condition="$(TargetFramework.StartsWith('MonoAndroid'))">
<AndroidResgenNamespace>Caliburn.Micro.Core</AndroidResgenNamespace>
</PropertyGroup>

<ItemGroup Condition="$(TargetFramework.StartsWith('Xamarin.iOS'))">
<Reference Include="System.Runtime.Serialization" />
</ItemGroup>

</Project>
7 changes: 2 additions & 5 deletions src/Caliburn.Micro.Platform/Caliburn.Micro.Platform.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,13 @@
<PackageId>Caliburn.Micro</PackageId>
<Product>Caliburn.Micro</Product>
<RootNamespace>Caliburn.Micro</RootNamespace>
<AssemblyOriginatorKeyFile>.\..\Caliburn.Micro.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'Xamarin.iOS10' or '$(TargetFramework)' == 'MonoAndroid80'">
<DefineConstants>XFORMS</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'net45'">
<AssemblyOriginatorKeyFile>.\..\Caliburn.Micro.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\Caliburn.Micro.Core\Caliburn.Micro.Core.csproj" />
Expand Down

0 comments on commit 9d61434

Please sign in to comment.