build

xamarin · Jun 27, 2018 · 8e21a9b · 8e21a9b
1 parent 89537fa
commit 8e21a9b
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 31 deletions.
diff --git a/Xamarin.Forms.Build.Tasks/Properties/AssemblyInfo.cs b/Xamarin.Forms.Build.Tasks/Properties/AssemblyInfo.cs
@@ -1,19 +1,24 @@
 using System.Reflection;
+using System.Runtime.CompilerServices;
 
 [assembly: AssemblyTitle("Xamarin.Forms.Build.Tasks")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
-[assembly: AssemblyFileVersion (
+[assembly: AssemblyFileVersion(
 	  ThisAssembly.Git.BaseVersion.Major + "."
 	+ ThisAssembly.Git.BaseVersion.Minor + "."
 	+ ThisAssembly.Git.BaseVersion.Patch + "."
 	+ ThisAssembly.Git.Commits)]
 
-[assembly: AssemblyInformationalVersion (
+[assembly: AssemblyInformationalVersion(
 	ThisAssembly.Git.BaseVersion.Major + "."
 	+ ThisAssembly.Git.BaseVersion.Minor + "."
 	+ ThisAssembly.Git.BaseVersion.Patch + "."
 	+ ThisAssembly.Git.Commits + "-"
 	+ ThisAssembly.Git.Branch + "+"
-	+ ThisAssembly.Git.Commit)]
+	+ ThisAssembly.Git.Commit)]
+
+#if DEBUG
+[assembly:InternalsVisibleTo("Xamarin.Forms.Xaml.UnitTests")]
+#endif
diff --git a/Xamarin.Forms.Build.Tasks/Xamarin.Forms.Build.Tasks.csproj b/Xamarin.Forms.Build.Tasks/Xamarin.Forms.Build.Tasks.csproj
@@ -1,16 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <_DisableStrongNamer Condition=" '$(_DisableStrongNamer)' != 'True' ">False</_DisableStrongNamer>
-    <AssemblyName>Xamarin.Forms.Build.Tasks</AssemblyName>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-    <SignAssembly Condition=" '$(_DisableStrongNamer)' != 'True' ">True</SignAssembly>
-    <DisableStrongNamer Condition=" '$(_DisableStrongNamer)' == 'True' ">True</DisableStrongNamer>
-    <DelaySign>true</DelaySign>
-    <AssemblyOriginatorKeyFile>..\xamarin.forms.snk</AssemblyOriginatorKeyFile>
-    <StrongNamerKeyFile>..\xamarin.forms.snk</StrongNamerKeyFile>
-  </PropertyGroup>
+	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+		<SignAssembly>false</SignAssembly>
+		<_DisableStrongNamer>True</_DisableStrongNamer>
+		<DelaySign>false</DelaySign>
+	</PropertyGroup>
+
+	<PropertyGroup>
+	    <_DisableStrongNamer Condition=" '$(_DisableStrongNamer)' != 'True' ">False</_DisableStrongNamer>
+	    <AssemblyName>Xamarin.Forms.Build.Tasks</AssemblyName>
+	    <TargetFramework>netstandard2.0</TargetFramework>
+	    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+	    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+	    <SignAssembly Condition=" '$(_DisableStrongNamer)' != 'True' ">True</SignAssembly>
+	    <DisableStrongNamer Condition=" '$(_DisableStrongNamer)' == 'True' ">True</DisableStrongNamer>
+	    <DelaySign>true</DelaySign>
+	    <AssemblyOriginatorKeyFile>..\xamarin.forms.snk</AssemblyOriginatorKeyFile>
+	    <StrongNamerKeyFile>..\xamarin.forms.snk</StrongNamerKeyFile>
+	</PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Mono.Cecil" Version="0.10.0-beta7" />
@@ -34,19 +40,6 @@
     </Compile>
   </ItemGroup>
 
-  <Target Name="_AddInternalsVisibleTo" Condition=" '$(_DisableStrongNamer)' == 'True' " BeforeTargets="BeforeCompile">
-	<ItemGroup>
-	  <AssemblyAttributes Include="System.Runtime.CompilerServices.InternalsVisibleTo">
-	    <_Parameter1>Xamarin.Forms.Xaml.UnitTests</_Parameter1>
-	  </AssemblyAttributes>
-	</ItemGroup>
-	<WriteCodeFragment Language="C#" OutputFile="$(IntermediateOutputPath)IVTAssemblyInfo.cs" AssemblyAttributes="@(AssemblyAttributes)" />
-	<ItemGroup>
- 	  <FileWrites Include="$(IntermediateOutputPath)IVTAssemblyInfo.cs" />
- 	  <Compile Include="$(IntermediateOutputPath)IVTAssemblyInfo.cs" />
- 	</ItemGroup>
-  </Target>
-
 	<PropertyGroup Condition="'$(SnExe)' == '' And '$(OS)' != 'Windows_NT'">
 		<SnExe>sn</SnExe>
 	</PropertyGroup>

diff --git a/Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj b/Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <_DisableStrongNamer>True</_DisableStrongNamer>
 	<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{4B14D295-C09B-4C38-B880-7CC768E50585}</ProjectGuid>
@@ -643,7 +642,6 @@
     <ProjectReference Include="..\Xamarin.Forms.Build.Tasks\Xamarin.Forms.Build.Tasks.csproj">
       <Project>{96D89208-4EB9-4451-BE73-8A9DF3D9D7B7}</Project>
       <Name>Xamarin.Forms.Build.Tasks</Name>
-      <AdditionalProperties>_DisableStrongNamer=True</AdditionalProperties>
     </ProjectReference>
     <ProjectReference Include="..\Xamarin.Forms.Controls\Xamarin.Forms.Controls.csproj">
       <Project>{CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}</Project>

diff --git a/Xamarin.Forms.sln b/Xamarin.Forms.sln
@@ -311,7 +311,6 @@ Global
 		{1346A7F1-4457-4BB4-A371-2C8E28BBD53E}.Release|x86.Build.0 = Release|Any CPU
 		{1346A7F1-4457-4BB4-A371-2C8E28BBD53E}.Release|x86.Deploy.0 = Release|Any CPU
 		{4B14D295-C09B-4C38-B880-7CC768E50585}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4B14D295-C09B-4C38-B880-7CC768E50585}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4B14D295-C09B-4C38-B880-7CC768E50585}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{4B14D295-C09B-4C38-B880-7CC768E50585}.Debug|ARM.Build.0 = Debug|Any CPU
 		{4B14D295-C09B-4C38-B880-7CC768E50585}.Debug|iPhone.ActiveCfg = Debug|Any CPU