diff --git a/.gitignore b/.gitignore index c4e3802ab0c..29c6ff80681 100644 --- a/.gitignore +++ b/.gitignore @@ -65,4 +65,5 @@ AndroidNative/gradlew.bat *.swp tools/ !tools/mdoc/**/* -caketools/ \ No newline at end of file +caketools/ +*.binlog diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 872e8c49433..00000000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "Xamarin.Forms.Build"] - path = Xamarin.Forms.Build - url = ../../xamarin/Xamarin.Forms.Build diff --git a/Directory.Build.props b/Directory.Build.props index 11da8e85e97..c59d7881bc5 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -5,4 +5,15 @@ <__XFBuildTasksLocation Condition="'$(__XFBuildTasksLocation)' == ''">$(MSBuildThisFileDirectory).nuspec\net46\ true - + + Microsoft + Xamarin.Forms + + + + + false + true + + + diff --git a/Directory.Build.targets b/Directory.Build.targets new file mode 100644 index 00000000000..85f1a8f91f0 --- /dev/null +++ b/Directory.Build.targets @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/EmbeddingTestBeds/Embedding.Droid/Embedding.Droid.csproj b/EmbeddingTestBeds/Embedding.Droid/Embedding.Droid.csproj index 7e70b15b9da..306ddbd54ee 100644 --- a/EmbeddingTestBeds/Embedding.Droid/Embedding.Droid.csproj +++ b/EmbeddingTestBeds/Embedding.Droid/Embedding.Droid.csproj @@ -56,7 +56,6 @@ - diff --git a/EmbeddingTestBeds/Embedding.Droid/Properties/AssemblyInfo.cs b/EmbeddingTestBeds/Embedding.Droid/Properties/AssemblyInfo.cs deleted file mode 100644 index 41522d1f30d..00000000000 --- a/EmbeddingTestBeds/Embedding.Droid/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using Android.App; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Embedding.Droid")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Embedding.Droid")] -[assembly: AssemblyCopyright("Copyright © 2017")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -[assembly: ComVisible(false)] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/EmbeddingTestBeds/Embedding.UWP/Embedding.UWP.csproj b/EmbeddingTestBeds/Embedding.UWP/Embedding.UWP.csproj index 0b5061085d4..1cf43850c51 100644 --- a/EmbeddingTestBeds/Embedding.UWP/Embedding.UWP.csproj +++ b/EmbeddingTestBeds/Embedding.UWP/Embedding.UWP.csproj @@ -99,7 +99,6 @@ Page2.xaml - diff --git a/EmbeddingTestBeds/Embedding.UWP/Properties/AssemblyInfo.cs b/EmbeddingTestBeds/Embedding.UWP/Properties/AssemblyInfo.cs deleted file mode 100644 index d7b4e09bba0..00000000000 --- a/EmbeddingTestBeds/Embedding.UWP/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Embedding.UWP")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Embedding.UWP")] -[assembly: AssemblyCopyright("Copyright © 2017")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: ComVisible(false)] \ No newline at end of file diff --git a/EmbeddingTestBeds/Embedding.iOS/Embedding.iOS.csproj b/EmbeddingTestBeds/Embedding.iOS/Embedding.iOS.csproj index 4fd06575812..3646af629f1 100644 --- a/EmbeddingTestBeds/Embedding.iOS/Embedding.iOS.csproj +++ b/EmbeddingTestBeds/Embedding.iOS/Embedding.iOS.csproj @@ -63,7 +63,6 @@ - ViewController.cs @@ -99,10 +98,6 @@ false false - - {67f9d3a8-f71e-4428-913f-c37ae82cdb24} - Xamarin.Forms.Platform - {02eac00f-0425-4959-ac64-e921627265ca} Embedding.XF diff --git a/EmbeddingTestBeds/Embedding.iOS/Properties/AssemblyInfo.cs b/EmbeddingTestBeds/Embedding.iOS/Properties/AssemblyInfo.cs deleted file mode 100644 index 1215de0b118..00000000000 --- a/EmbeddingTestBeds/Embedding.iOS/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Embedding.iOS")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Embedding.iOS")] -[assembly: AssemblyCopyright("Copyright © 2017")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("29dde791-5608-4072-8e1c-d37d72992a83")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/PagesGallery/PagesGallery.Droid/Properties/AssemblyInfo.cs b/PagesGallery/PagesGallery.Droid/Properties/AssemblyInfo.cs index 9562722123e..8cf4d8d8183 100644 --- a/PagesGallery/PagesGallery.Droid/Properties/AssemblyInfo.cs +++ b/PagesGallery/PagesGallery.Droid/Properties/AssemblyInfo.cs @@ -1,34 +1,4 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using Android.App; +using Android.App; -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle ("PagesGallery.Droid")] -[assembly: AssemblyDescription ("")] -[assembly: AssemblyConfiguration ("")] -[assembly: AssemblyCompany ("")] -[assembly: AssemblyProduct ("PagesGallery.Droid")] -[assembly: AssemblyCopyright ("Copyright © 2014")] -[assembly: AssemblyTrademark ("")] -[assembly: AssemblyCulture ("")] -[assembly: ComVisible (false)] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion ("1.0.0.0")] -[assembly: AssemblyFileVersion ("1.0.0.0")] - -// Add some common permissions, these can be removed if not needed [assembly: UsesPermission (Android.Manifest.Permission.Internet)] [assembly: UsesPermission (Android.Manifest.Permission.WriteExternalStorage)] diff --git a/PagesGallery/PagesGallery.UWP/PagesGallery.UWP.csproj b/PagesGallery/PagesGallery.UWP/PagesGallery.UWP.csproj index 5d7a3ab4985..13957f2c36f 100644 --- a/PagesGallery/PagesGallery.UWP/PagesGallery.UWP.csproj +++ b/PagesGallery/PagesGallery.UWP/PagesGallery.UWP.csproj @@ -100,7 +100,6 @@ MainPage.xaml - diff --git a/PagesGallery/PagesGallery.UWP/Properties/AssemblyInfo.cs b/PagesGallery/PagesGallery.UWP/Properties/AssemblyInfo.cs deleted file mode 100644 index a0611778af4..00000000000 --- a/PagesGallery/PagesGallery.UWP/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle ("PagesGallery.UWP")] -[assembly: AssemblyDescription ("")] -[assembly: AssemblyConfiguration ("")] -[assembly: AssemblyCompany ("")] -[assembly: AssemblyProduct ("PagesGallery.UWP")] -[assembly: AssemblyCopyright ("Copyright © 2015")] -[assembly: AssemblyTrademark ("")] -[assembly: AssemblyCulture ("")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion ("1.0.0.0")] -[assembly: AssemblyFileVersion ("1.0.0.0")] -[assembly: ComVisible (false)] \ No newline at end of file diff --git a/PagesGallery/PagesGallery.iOS/PagesGallery.iOS.csproj b/PagesGallery/PagesGallery.iOS/PagesGallery.iOS.csproj index 4cb5e5ea28f..3249b59fc83 100644 --- a/PagesGallery/PagesGallery.iOS/PagesGallery.iOS.csproj +++ b/PagesGallery/PagesGallery.iOS/PagesGallery.iOS.csproj @@ -69,7 +69,6 @@ - diff --git a/PagesGallery/PagesGallery.iOS/Properties/AssemblyInfo.cs b/PagesGallery/PagesGallery.iOS/Properties/AssemblyInfo.cs deleted file mode 100644 index c91e3867654..00000000000 --- a/PagesGallery/PagesGallery.iOS/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle ("PagesGallery.iOS")] -[assembly: AssemblyDescription ("")] -[assembly: AssemblyConfiguration ("")] -[assembly: AssemblyCompany ("")] -[assembly: AssemblyProduct ("PagesGallery.iOS")] -[assembly: AssemblyCopyright ("Copyright © 2014")] -[assembly: AssemblyTrademark ("")] -[assembly: AssemblyCulture ("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible (false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid ("72bdc44f-c588-44f3-b6df-9aace7daafdd")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion ("1.0.0.0")] -[assembly: AssemblyFileVersion ("1.0.0.0")] diff --git a/Stubs/Xamarin.Forms.Platform.Android/Properties/AssemblyInfo.cs b/Stubs/Xamarin.Forms.Platform.Android/Properties/AssemblyInfo.cs index e30743a615e..76555531629 100644 --- a/Stubs/Xamarin.Forms.Platform.Android/Properties/AssemblyInfo.cs +++ b/Stubs/Xamarin.Forms.Platform.Android/Properties/AssemblyInfo.cs @@ -1,31 +1,7 @@ using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using Android.App; -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. [assembly: AssemblyTitle ("Xamarin.Forms.Platform.Android")] -[assembly: AssemblyDescription ("")] -[assembly: AssemblyConfiguration ("")] -[assembly: AssemblyCompany ("")] -[assembly: AssemblyProduct ("Xamarin.Forms.Platform.Android")] -[assembly: AssemblyCopyright ("Copyright © 2015")] -[assembly: AssemblyTrademark ("")] -[assembly: AssemblyCulture ("")] [assembly: InternalsVisibleTo ("Xamarin.Forms.Core")] [assembly: ComVisible (false)] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion ("1.0.0.0")] -[assembly: AssemblyFileVersion ("1.0.0.0")] diff --git a/Stubs/Xamarin.Forms.Platform.Tizen/Properties/AssemblyInfo.cs b/Stubs/Xamarin.Forms.Platform.Tizen/Properties/AssemblyInfo.cs index 0c1defe8880..140a616ca99 100644 --- a/Stubs/Xamarin.Forms.Platform.Tizen/Properties/AssemblyInfo.cs +++ b/Stubs/Xamarin.Forms.Platform.Tizen/Properties/AssemblyInfo.cs @@ -1,31 +1,7 @@ -using System.Reflection; -using System.Runtime.CompilerServices; +using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyDescription ("")] -[assembly: AssemblyCopyright ("Copyright © 2018")] -[assembly: AssemblyTrademark ("")] -[assembly: AssemblyCulture ("")] [assembly: InternalsVisibleTo ("Xamarin.Forms.Core")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. [assembly: ComVisible (false)] - // The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid ("d3f9fea6-cce8-4c30-b0d2-197b40c50757")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] +[assembly: Guid ("d3f9fea6-cce8-4c30-b0d2-197b40c50757")] \ No newline at end of file diff --git a/Stubs/Xamarin.Forms.Platform.iOS/Properties/AssemblyInfo.cs b/Stubs/Xamarin.Forms.Platform.iOS/Properties/AssemblyInfo.cs index 047b72b9df6..9053c8a5dc6 100644 --- a/Stubs/Xamarin.Forms.Platform.iOS/Properties/AssemblyInfo.cs +++ b/Stubs/Xamarin.Forms.Platform.iOS/Properties/AssemblyInfo.cs @@ -2,36 +2,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. [assembly: AssemblyTitle ("Xamarin.Forms.Platform.iOS")] -[assembly: AssemblyDescription ("")] -[assembly: AssemblyConfiguration ("")] -[assembly: AssemblyCompany ("")] -[assembly: AssemblyProduct ("Xamarin.Forms.Platform.iOS")] -[assembly: AssemblyCopyright ("Copyright © 2015")] -[assembly: AssemblyTrademark ("")] -[assembly: AssemblyCulture ("")] -[assembly: InternalsVisibleTo ("Xamarin.Forms.Core")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible (false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid ("d3f9fea6-cce8-4c30-b0d2-197b40c50756")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion ("1.0.0.0")] -[assembly: AssemblyFileVersion ("1.0.0.0")] +[assembly: InternalsVisibleTo ("Xamarin.Forms.Core")] \ No newline at end of file diff --git a/Version.targets b/Version.targets new file mode 100644 index 00000000000..34b19d19d6b --- /dev/null +++ b/Version.targets @@ -0,0 +1,69 @@ + + + $(SYSTEM_PULLREQUEST_TARGETBRANCH) + $(BUILD_SOURCEBRANCHNAME) + + + + + + + + + + + + + + + + @(VersionMetadata -> '%(Identity)', '-') + +$(VersionMetadataLabel) + + $(GitSemVerDashLabel).$(GitCommits) + $(GitSemVerMajor).$(GitSemVerMinor).$(GitSemVerPatch) + $(Version)$(GitSemVerDashLabel)$(VersionMetadataPlusLabel) + + + + $(PackageVersion) + $(Version).$(GitCommits) + $(Version).0 + + + + + <_Parameter1>Version + <_Parameter2>$(Version) + + + <_Parameter1>PackageVersion + <_Parameter2>$(PackageVersion) + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Xamarin.Forms.Build.Tasks/Properties/AssemblyInfo.cs b/Xamarin.Forms.Build.Tasks/Properties/AssemblyInfo.cs index 29baafd85c6..988eeb051d7 100644 --- a/Xamarin.Forms.Build.Tasks/Properties/AssemblyInfo.cs +++ b/Xamarin.Forms.Build.Tasks/Properties/AssemblyInfo.cs @@ -1,24 +1,6 @@ using System.Reflection; using System.Runtime.CompilerServices; -[assembly: AssemblyTitle("Xamarin.Forms.Build.Tasks")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCulture("")] -[assembly: AssemblyFileVersion( - ThisAssembly.Git.BaseVersion.Major + "." - + ThisAssembly.Git.BaseVersion.Minor + "." - + ThisAssembly.Git.BaseVersion.Patch + "." - + ThisAssembly.Git.Commits)] - -[assembly: AssemblyInformationalVersion( - ThisAssembly.Git.BaseVersion.Major + "." - + ThisAssembly.Git.BaseVersion.Minor + "." - + ThisAssembly.Git.BaseVersion.Patch + "." - + ThisAssembly.Git.Commits + "-" - + ThisAssembly.Git.Branch + "+" - + ThisAssembly.Git.Commit)] - #if DEBUG [assembly:InternalsVisibleTo("Xamarin.Forms.Xaml.UnitTests")] #endif \ No newline at end of file diff --git a/Xamarin.Forms.Build.Tasks/Xamarin.Forms.Build.Tasks.csproj b/Xamarin.Forms.Build.Tasks/Xamarin.Forms.Build.Tasks.csproj index 051dfc9df85..bdbdfe96395 100644 --- a/Xamarin.Forms.Build.Tasks/Xamarin.Forms.Build.Tasks.csproj +++ b/Xamarin.Forms.Build.Tasks/Xamarin.Forms.Build.Tasks.csproj @@ -8,8 +8,8 @@ <_DisableStrongNamer Condition=" '$(_DisableStrongNamer)' != 'True' ">False Xamarin.Forms.Build.Tasks + Xamarin Forms Build Task net46;netstandard2.0 - false true True True @@ -27,7 +27,6 @@ - @@ -35,12 +34,6 @@ - - - Properties\GlobalAssemblyInfo.cs - - - sn diff --git a/Xamarin.Forms.ControlGallery.Android/Properties/AssemblyInfo.cs b/Xamarin.Forms.ControlGallery.Android/Properties/AssemblyInfo.cs index 84debc761b7..fd7e45468ab 100644 --- a/Xamarin.Forms.ControlGallery.Android/Properties/AssemblyInfo.cs +++ b/Xamarin.Forms.ControlGallery.Android/Properties/AssemblyInfo.cs @@ -1,47 +1,19 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using Android.App; -using Xamarin.Forms.Controls; -using Xamarin.Forms.Platform.Android; using Xamarin.Forms; using Xamarin.Forms.ControlGallery.Android; -using Xamarin.Forms.Controls.Issues; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle ("Xamarin.Forms.ControlGallery.Android")] -[assembly: AssemblyDescription ("")] -[assembly: AssemblyConfiguration ("")] -[assembly: AssemblyCompany ("")] -[assembly: AssemblyProduct ("Xamarin.Forms.ControlGallery.Android")] -[assembly: AssemblyCopyright ("Copyright © 2013")] -[assembly: AssemblyTrademark ("")] -[assembly: AssemblyCulture ("")] -[assembly: ComVisible (false)] +using Xamarin.Forms.Controls; -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion ("1.0.0.0")] -[assembly: AssemblyFileVersion ("1.0.0.0")] +[assembly: AssemblyTitle("Xamarin.Forms.ControlGallery.Android")] +[assembly: ComVisible(false)] // Add some common permissions, these can be removed if not needed -[assembly: UsesPermission (Android.Manifest.Permission.Internet)] -[assembly: UsesPermission (Android.Manifest.Permission.WriteExternalStorage)] - - +[assembly: UsesPermission(Android.Manifest.Permission.Internet)] +[assembly: UsesPermission(Android.Manifest.Permission.WriteExternalStorage)] [assembly: Android.App.MetaData("com.google.android.maps.v2.API_KEY", Value = "AIzaSyAdstcJQswxEjzX5YjLaMcu2aRVEBJw39Y")] -[assembly: Xamarin.Forms.ResolutionGroupName (Xamarin.Forms.Controls.Issues.Effects.ResolutionGroupName)] +[assembly: Xamarin.Forms.ResolutionGroupName(Xamarin.Forms.Controls.Issues.Effects.ResolutionGroupName)] // Deliberately broken image source and handler so we can test handling of image loading errors [assembly: ExportImageSourceHandler(typeof(FailImageSource), typeof(BrokenImageSourceHandler))] \ No newline at end of file diff --git a/Xamarin.Forms.ControlGallery.GTK/Properties/AssemblyInfo.cs b/Xamarin.Forms.ControlGallery.GTK/Properties/AssemblyInfo.cs deleted file mode 100644 index bc48a9b4243..00000000000 --- a/Xamarin.Forms.ControlGallery.GTK/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// La información general de un ensamblado se controla mediante el siguiente -// conjunto de atributos. Cambie estos valores de atributo para modificar la información -// asociada con un ensamblado. -[assembly: AssemblyTitle("Xamarin.Forms.ControlGallery.GTK")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Xamarin.Forms.ControlGallery.GTK")] -[assembly: AssemblyCopyright("Copyright © 2017")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Si establece ComVisible en false, los tipos de este ensamblado no estarán visibles -// para los componentes COM. Si necesita obtener acceso a un tipo de este ensamblado desde -// COM, establezca el atributo ComVisible en true en este tipo. -[assembly: ComVisible(false)] - -// El siguiente GUID sirve como id. de typelib si este proyecto se expone a COM. -[assembly: Guid("03a51e5b-0a1e-41f0-aae3-4b19406f7340")] - -// La información de versión de un ensamblado consta de los cuatro valores siguientes: -// -// Versión principal -// Versión secundaria -// Número de compilación -// Revisión -// -// Puede especificar todos los valores o usar los valores predeterminados de número de compilación y de revisión -// mediante el carácter '*', como se muestra a continuación: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Xamarin.Forms.ControlGallery.GTK/Xamarin.Forms.ControlGallery.GTK.csproj b/Xamarin.Forms.ControlGallery.GTK/Xamarin.Forms.ControlGallery.GTK.csproj index e9e82b74b6f..2a855b4125e 100644 --- a/Xamarin.Forms.ControlGallery.GTK/Xamarin.Forms.ControlGallery.GTK.csproj +++ b/Xamarin.Forms.ControlGallery.GTK/Xamarin.Forms.ControlGallery.GTK.csproj @@ -97,7 +97,6 @@ - @@ -273,7 +272,7 @@ -