Skip to content

Commit

Permalink
Merge pull request #704 from willson556/master
Browse files Browse the repository at this point in the history
Strong-name all Assemblies
  • Loading branch information
nigel-sampson authored Jun 11, 2020
2 parents b2055e2 + 5d31bc6 commit b5e278c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 9 deletions.
5 changes: 1 addition & 4 deletions src/Caliburn.Micro.Core/Caliburn.Micro.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
<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>
Expand All @@ -19,7 +16,7 @@
<ItemGroup Condition="$(TargetFramework.StartsWith('MonoAndroid'))">
<Reference Include="System.Runtime.Serialization" />
</ItemGroup>

<PropertyGroup Condition="$(TargetFramework.StartsWith('MonoAndroid'))">
<AndroidResgenNamespace>Caliburn.Micro.Core</AndroidResgenNamespace>
</PropertyGroup>
Expand Down
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 b5e278c

Please sign in to comment.