From 62eb2893053cc644c20bae321f00180e12a09d16 Mon Sep 17 00:00:00 2001
From: danmosemsft <danmose@microsoft.com>
Date: Sun, 22 Jan 2017 20:47:11 -0800
Subject: [PATCH] Remove FEATURE_STRONGNAME_MIGRATION

---
 clr.coreclr.props                                        | 1 -
 clr.defines.targets                                      | 2 --
 clr.desktop.props                                        | 1 -
 src/mscorlib/src/System/Reflection/AssemblyAttributes.cs | 2 --
 4 files changed, 6 deletions(-)

diff --git a/clr.coreclr.props b/clr.coreclr.props
index afb5994..89dce77 100644
--- a/clr.coreclr.props
+++ b/clr.coreclr.props
@@ -26,7 +26,6 @@
     <FeaturePrejit>true</FeaturePrejit>
     <FeatureStandaloneSn>true</FeatureStandaloneSn>
     <FeatureStrongnameDelaySigningAllowed>true</FeatureStrongnameDelaySigningAllowed>
-    <FeatureStrongnameMigration>true</FeatureStrongnameMigration>
     <FeatureStrongnameTestkeyAllowed>true</FeatureStrongnameTestkeyAllowed>
     <FeatureSyntheticCultures>true</FeatureSyntheticCultures>
     <FeatureVersioning>true</FeatureVersioning>
diff --git a/clr.defines.targets b/clr.defines.targets
index c6c6c70..01493d7 100644
--- a/clr.defines.targets
+++ b/clr.defines.targets
@@ -83,7 +83,6 @@
         <CDefines Condition="'$(FeatureStackProbe)' == 'true'">$(CDefines);FEATURE_STACK_PROBE</CDefines>
         <CDefines Condition="'$(FeatureStandaloneSn)' == 'true'">$(CDefines);FEATURE_STANDALONE_SN</CDefines>
         <CDefines Condition="'$(FeatureStrongnameDelaySigningAllowed)' == 'true'">$(CDefines);FEATURE_STRONGNAME_DELAY_SIGNING_ALLOWED</CDefines>
-        <CDefines Condition="'$(FeatureStrongnameMigration)' == 'true'">$(CDefines);FEATURE_STRONGNAME_MIGRATION</CDefines>
         <CDefines Condition="'$(FeatureSvrGc)' == 'true'">$(CDefines);FEATURE_SVR_GC</CDefines>
         <CDefines Condition="'$(FeatureSynchronizationContextWait)' == 'true'">$(CDefines);FEATURE_SYNCHRONIZATIONCONTEXT_WAIT</CDefines>
         <CDefines Condition="'$(FeaturePerfMap)' == 'true'">$(CDefines);FEATURE_PERFMAP</CDefines>
@@ -162,7 +161,6 @@
         <DefineConstants Condition="'$(FeatureRwlock)' == 'true'">$(DefineConstants);FEATURE_RWLOCK</DefineConstants>
         <DefineConstants Condition="'$(FeatureSerialization)' == 'true'">$(DefineConstants);FEATURE_SERIALIZATION</DefineConstants>
         <DefineConstants Condition="'$(FeatureSortTables)' == 'true'">$(DefineConstants);FEATURE_SORT_TABLES</DefineConstants>
-        <DefineConstants Condition="'$(FeatureStrongnameMigration)' == 'true'">$(DefineConstants);FEATURE_STRONGNAME_MIGRATION</DefineConstants>
         <DefineConstants Condition="'$(FeatureSynchronizationcontextWait)' == 'true'">$(DefineConstants);FEATURE_SYNCHRONIZATIONCONTEXT_WAIT</DefineConstants>
         <DefineConstants Condition="'$(FeatureSyntheticCultures)' == 'true'">$(DefineConstants);FEATURE_SYNTHETIC_CULTURES</DefineConstants>
         <DefineConstants Condition="'$(FeatureTypeEquivalence)' == 'true'">$(DefineConstants);FEATURE_TYPEEQUIVALENCE</DefineConstants>
diff --git a/clr.desktop.props b/clr.desktop.props
index c295632..e10f048 100644
--- a/clr.desktop.props
+++ b/clr.desktop.props
@@ -69,7 +69,6 @@
     <FeatureSortTables>true</FeatureSortTables>
     <FeatureStackProbe Condition="'$(TargetArch)' != 'arm'">true</FeatureStackProbe>
     <FeatureStrongnameDelaySigningAllowed>true</FeatureStrongnameDelaySigningAllowed>
-    <FeatureStrongnameMigration>true</FeatureStrongnameMigration>
     <FeatureSvrGc>true</FeatureSvrGc>
     <FeatureSynchronizationcontextWait>true</FeatureSynchronizationcontextWait>
     <FeatureSyntheticCultures>true</FeatureSyntheticCultures>
diff --git a/src/mscorlib/src/System/Reflection/AssemblyAttributes.cs b/src/mscorlib/src/System/Reflection/AssemblyAttributes.cs
index b2e44b0..4b550b4 100644
--- a/src/mscorlib/src/System/Reflection/AssemblyAttributes.cs
+++ b/src/mscorlib/src/System/Reflection/AssemblyAttributes.cs
@@ -360,7 +360,6 @@ namespace System.Reflection {
         }
     }   
 
-#if FEATURE_STRONGNAME_MIGRATION
     [AttributeUsage(AttributeTargets.Assembly, Inherited = false, AllowMultiple=false)]
     public sealed class AssemblySignatureKeyAttribute : Attribute
     {
@@ -383,7 +382,6 @@ namespace System.Reflection {
             get { return _countersignature; }
         }
     }
-#endif
 
     [AttributeUsage (AttributeTargets.Assembly, Inherited=false)]  
 [System.Runtime.InteropServices.ComVisible(true)]
-- 
2.7.4