Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/xamarin/Xamarin.PropertyEditing.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Medrano <jose.medrano@microsoft.com>2019-03-25 14:49:41 +0300
committerJose Medrano <jose.medrano@microsoft.com>2019-03-25 15:05:52 +0300
commit9b122cef903d72475c4b58bf51f26060b54994f1 (patch)
tree11b8c2e1dcaa7e1e114ff6269eb8dbf6c63d0b32
parent3309836f5d2677951e5bd9b7d507a5fe9cae33c6 (diff)
[build] Strongname this so it can be referenced by other strongnamed libsmonodevelop
cherrypicked and solved conflicts from https://github.com/xamarin/Xamarin.PropertyEditing/commit/29f5bee126b7ab7cfa7026fc877a12a16f92f24c
-rw-r--r--Directory.Build.props3
-rw-r--r--Directory.Build.targets6
-rw-r--r--Xamarin.PropertyEditing.Mac/Xamarin.PropertyEditing.Mac.csproj6
-rw-r--r--Xamarin.PropertyEditing.Tests/Xamarin.PropertyEditing.Tests.csproj6
-rw-r--r--Xamarin.PropertyEditing.Windows/Xamarin.PropertyEditing.Windows.csproj6
-rw-r--r--Xamarin.PropertyEditing.snkbin0 -> 596 bytes
-rw-r--r--Xamarin.PropertyEditing/Properties/AssemblyInfo.cs12
-rw-r--r--Xamarin.PropertyEditing/Xamarin.PropertyEditing.csproj6
8 files changed, 12 insertions, 33 deletions
diff --git a/Directory.Build.props b/Directory.Build.props
new file mode 100644
index 0000000..dfcb57f
--- /dev/null
+++ b/Directory.Build.props
@@ -0,0 +1,3 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <!-- Deliberately empty so we don't inherit files from whoever submodules this repository -->
+</Project>
diff --git a/Directory.Build.targets b/Directory.Build.targets
new file mode 100644
index 0000000..f84eb8f
--- /dev/null
+++ b/Directory.Build.targets
@@ -0,0 +1,6 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)Xamarin.PropertyEditing.snk</AssemblyOriginatorKeyFile>
+ <SignAssembly>true</SignAssembly>
+ </PropertyGroup>
+</Project>
diff --git a/Xamarin.PropertyEditing.Mac/Xamarin.PropertyEditing.Mac.csproj b/Xamarin.PropertyEditing.Mac/Xamarin.PropertyEditing.Mac.csproj
index 9378951..537ee02 100644
--- a/Xamarin.PropertyEditing.Mac/Xamarin.PropertyEditing.Mac.csproj
+++ b/Xamarin.PropertyEditing.Mac/Xamarin.PropertyEditing.Mac.csproj
@@ -44,12 +44,6 @@
<LinkMode></LinkMode>
<XamMacArch></XamMacArch>
</PropertyGroup>
- <!-- Build with strong naming if built as part of some Xamarin VSIX, normally referencing this project as a git submodule under external\Xamarin.PropertyEditing -->
- <PropertyGroup Condition="Exists('../../../xamarin.snk')">
- <AssemblyOriginatorKeyFile>../../../xamarin.snk</AssemblyOriginatorKeyFile>
- <SignAssembly>true</SignAssembly>
- <DefineConstants>$(DefineConstants);STRONG_NAMED</DefineConstants>
- </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
diff --git a/Xamarin.PropertyEditing.Tests/Xamarin.PropertyEditing.Tests.csproj b/Xamarin.PropertyEditing.Tests/Xamarin.PropertyEditing.Tests.csproj
index 85d1e3a..40f124a 100644
--- a/Xamarin.PropertyEditing.Tests/Xamarin.PropertyEditing.Tests.csproj
+++ b/Xamarin.PropertyEditing.Tests/Xamarin.PropertyEditing.Tests.csproj
@@ -33,12 +33,6 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
- <!-- Build with strong naming if built as part of some Xamarin VSIX, normally referencing this project as a git submodule under external/Xamarin.PropertyEditing -->
- <PropertyGroup Condition="Exists('..\..\..\xamarin.snk')">
- <AssemblyOriginatorKeyFile>..\..\..\xamarin.snk</AssemblyOriginatorKeyFile>
- <SignAssembly>true</SignAssembly>
- <DefineConstants>$(DefineConstants);STRONG_NAMED</DefineConstants>
- </PropertyGroup>
<ItemGroup>
<PackageReference Include="Moq" Version="4.5.30.0" />
<PackageReference Include="NUnit" Version="3.7.1" />
diff --git a/Xamarin.PropertyEditing.Windows/Xamarin.PropertyEditing.Windows.csproj b/Xamarin.PropertyEditing.Windows/Xamarin.PropertyEditing.Windows.csproj
index d8f8f6c..56b5a86 100644
--- a/Xamarin.PropertyEditing.Windows/Xamarin.PropertyEditing.Windows.csproj
+++ b/Xamarin.PropertyEditing.Windows/Xamarin.PropertyEditing.Windows.csproj
@@ -30,12 +30,6 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
- <!-- Build with strong naming if built as part of some Xamarin VSIX, normally referencing this project as a git submodule under external\Xamarin.PropertyEditing -->
- <PropertyGroup Condition="Exists('..\..\..\xamarin.snk')">
- <AssemblyOriginatorKeyFile>..\..\..\xamarin.snk</AssemblyOriginatorKeyFile>
- <SignAssembly>true</SignAssembly>
- <DefineConstants>$(DefineConstants);STRONG_NAMED</DefineConstants>
- </PropertyGroup>
<ItemGroup>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
diff --git a/Xamarin.PropertyEditing.snk b/Xamarin.PropertyEditing.snk
new file mode 100644
index 0000000..9e2f156
--- /dev/null
+++ b/Xamarin.PropertyEditing.snk
Binary files differ
diff --git a/Xamarin.PropertyEditing/Properties/AssemblyInfo.cs b/Xamarin.PropertyEditing/Properties/AssemblyInfo.cs
index 917d438..b5b31cc 100644
--- a/Xamarin.PropertyEditing/Properties/AssemblyInfo.cs
+++ b/Xamarin.PropertyEditing/Properties/AssemblyInfo.cs
@@ -6,12 +6,6 @@ using System.Runtime.InteropServices;
[assembly: ComVisible (false)]
[assembly: Guid ("a0b6fe73-d046-4e1c-ba9d-f20683889c5a")]
-#if STRONG_NAMED
-[assembly: InternalsVisibleTo ("Xamarin.PropertyEditing.Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df")]
-[assembly: InternalsVisibleTo ("Xamarin.PropertyEditing.Windows, PublicKey=002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df")]
-[assembly: InternalsVisibleTo ("Xamarin.PropertyEditing.Mac, PublicKey=002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df")]
-#else
-[assembly: InternalsVisibleTo ("Xamarin.PropertyEditing.Tests")]
-[assembly: InternalsVisibleTo ("Xamarin.PropertyEditing.Windows")]
-[assembly: InternalsVisibleTo ("Xamarin.PropertyEditing.Mac")]
-#endif
+[assembly: InternalsVisibleTo ("Xamarin.PropertyEditing.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100779ef9d5316870904e12da94285478d80fe3bcab75e07b2d512110e712575676e8372d97967220f14e4d359112f6835b9e7b95e9622522446ab3b1c56e31fbf1458247ac7ba32c9a1e6a7d4c633b24cd780cb2ad4d5a7a17c59a34457691bf19c5506485f23981f7a8e51e1b8b4221277e411656a5b4687460da5812572c199a")]
+[assembly: InternalsVisibleTo ("Xamarin.PropertyEditing.Windows, PublicKey=0024000004800000940000000602000000240000525341310004000001000100779ef9d5316870904e12da94285478d80fe3bcab75e07b2d512110e712575676e8372d97967220f14e4d359112f6835b9e7b95e9622522446ab3b1c56e31fbf1458247ac7ba32c9a1e6a7d4c633b24cd780cb2ad4d5a7a17c59a34457691bf19c5506485f23981f7a8e51e1b8b4221277e411656a5b4687460da5812572c199a")]
+[assembly: InternalsVisibleTo ("Xamarin.PropertyEditing.Mac, PublicKey=0024000004800000940000000602000000240000525341310004000001000100779ef9d5316870904e12da94285478d80fe3bcab75e07b2d512110e712575676e8372d97967220f14e4d359112f6835b9e7b95e9622522446ab3b1c56e31fbf1458247ac7ba32c9a1e6a7d4c633b24cd780cb2ad4d5a7a17c59a34457691bf19c5506485f23981f7a8e51e1b8b4221277e411656a5b4687460da5812572c199a")]
diff --git a/Xamarin.PropertyEditing/Xamarin.PropertyEditing.csproj b/Xamarin.PropertyEditing/Xamarin.PropertyEditing.csproj
index 41050be..a6f2029 100644
--- a/Xamarin.PropertyEditing/Xamarin.PropertyEditing.csproj
+++ b/Xamarin.PropertyEditing/Xamarin.PropertyEditing.csproj
@@ -30,12 +30,6 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
- <!-- Build with strong naming if built as part of some Xamarin VSIX, normally referencing this project as a git submodule under external/Xamarin.PropertyEditing -->
- <PropertyGroup Condition="Exists('..\..\..\xamarin.snk')">
- <AssemblyOriginatorKeyFile>..\..\..\xamarin.snk</AssemblyOriginatorKeyFile>
- <SignAssembly>true</SignAssembly>
- <DefineConstants>$(DefineConstants);STRONG_NAMED</DefineConstants>
- </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />