From e7fab78d0405fce59b49d150435ecf7fef321f67 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Thu, 16 Aug 2018 16:46:39 -0500 Subject: [PATCH] Use MSBuild.Sdk.Extras to switch the rest of our library projects to the new project format. --- global.json | 3 +- .../Avalonia.Android/Avalonia.Android.csproj | 141 ++---------------- .../Properties/AssemblyInfo.cs | 30 ---- .../Avalonia.Win32.Interop.csproj | 138 +++-------------- .../Properties/AssemblyInfo.cs | 36 ----- .../Avalonia.Win32.Shared.shproj | 13 -- src/iOS/Avalonia.iOS/Avalonia.iOS.csproj | 113 ++------------ .../Avalonia.iOS/Properties/AssemblyInfo.cs | 36 ----- src/iOS/Avalonia.iOS/iOSPlatform.cs | 17 --- 9 files changed, 46 insertions(+), 481 deletions(-) delete mode 100644 src/Android/Avalonia.Android/Properties/AssemblyInfo.cs delete mode 100644 src/Windows/Avalonia.Win32.Interop/Properties/AssemblyInfo.cs delete mode 100644 src/Windows/Avalonia.Win32/Avalonia.Win32.Shared.shproj delete mode 100644 src/iOS/Avalonia.iOS/Properties/AssemblyInfo.cs diff --git a/global.json b/global.json index a72a51736f..38f403a701 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,6 @@ { "msbuild-sdks": { - "Microsoft.Build.Traversal": "1.0.41" + "Microsoft.Build.Traversal": "1.0.41", + "MSBuild.Sdk.Extras": "1.6.46" } } diff --git a/src/Android/Avalonia.Android/Avalonia.Android.csproj b/src/Android/Avalonia.Android/Avalonia.Android.csproj index c61bae4724..3fa14055db 100644 --- a/src/Android/Avalonia.Android/Avalonia.Android.csproj +++ b/src/Android/Avalonia.Android/Avalonia.Android.csproj @@ -1,137 +1,20 @@ - - + - Debug - AnyCPU - 8.0.30703 - 2.0 - {7B92AF71-6287-4693-9DCB-BD5B6E927E23} - {EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Library - Properties - Avalonia.Android - Avalonia.Android - 512 - Resources\Resource.Designer.cs - Off - False - v4.4 + monoandroid44 + true - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {3e53a01a-b331-47f3-b828-4a5717e77a24} - Avalonia.Markup.Xaml - - - {d211e587-d8bc-45b9-95a4-f297c8fa5200} - Avalonia.Animation - - - {b09b78d8-9b26-48b0-9149-d64a2f120f3f} - Avalonia.Base - - - {d2221c82-4a25-4583-9b43-d791e3f6820c} - Avalonia.Controls - - - {7062ae20-5dcc-4442-9645-8195bdece63e} - Avalonia.Diagnostics - - - {62024b2d-53eb-4638-b26b-85eeaa54866e} - Avalonia.Input - - - {6b0ed19d-a08b-461c-a9d9-a9ee40b0c06b} - Avalonia.Interactivity - - - {42472427-4774-4c81-8aff-9f27b8e31721} - Avalonia.Layout - - - {6417b24e-49c2-4985-8db2-3ab9d898ec91} - Avalonia.ReactiveUI - - - {eb582467-6abb-43a1-b052-e981ba910e3a} - Avalonia.Visuals - - - {f1baa01a-f176-4c6a-b39d-5b40bb1b148f} - Avalonia.Styling - - - {7d2d3083-71dd-4cc9-8907-39a0d86fb322} - Avalonia.Skia - + + + + + + + + + - - diff --git a/src/Android/Avalonia.Android/Properties/AssemblyInfo.cs b/src/Android/Avalonia.Android/Properties/AssemblyInfo.cs deleted file mode 100644 index 3d72b292a4..0000000000 --- a/src/Android/Avalonia.Android/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System.Reflection; -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("Avalonia.Android")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Avalonia.Android")] -[assembly: AssemblyCopyright("Copyright © 2015")] -[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")] \ No newline at end of file diff --git a/src/Windows/Avalonia.Win32.Interop/Avalonia.Win32.Interop.csproj b/src/Windows/Avalonia.Win32.Interop/Avalonia.Win32.Interop.csproj index 7b480ef328..27f6b502d2 100644 --- a/src/Windows/Avalonia.Win32.Interop/Avalonia.Win32.Interop.csproj +++ b/src/Windows/Avalonia.Win32.Interop/Avalonia.Win32.Interop.csproj @@ -1,123 +1,29 @@ - - - + - Debug - AnyCPU - {CBC4FF2F-92D4-420B-BE21-9FE0B930B04E} - Library - Properties - Avalonia.Win32.Interop - Avalonia.Win32.Interop - v4.6.1 - 512 - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + net461 + true + true + true + true - - - - - - - - - - - - - - - - - UnmanagedMethods.cs - - - - Component - - - - - - - - - + + + + + + + + + + + + + - - {d211e587-d8bc-45b9-95a4-f297c8fa5200} - Avalonia.Animation - - - {b09b78d8-9b26-48b0-9149-d64a2f120f3f} - Avalonia.Base - - - {d2221c82-4a25-4583-9b43-d791e3f6820c} - Avalonia.Controls - - - {4a1abb09-9047-4bd5-a4ad-a055e52c5ee0} - Avalonia.DotNetFrameworkRuntime - - - {62024b2d-53eb-4638-b26b-85eeaa54866e} - Avalonia.Input - - - {6b0ed19d-a08b-461c-a9d9-a9ee40b0c06b} - Avalonia.Interactivity - - - {42472427-4774-4c81-8aff-9f27b8e31721} - Avalonia.Layout - - - {f1baa01a-f176-4c6a-b39d-5b40bb1b148f} - Avalonia.Styling - - - {eb582467-6abb-43a1-b052-e981ba910e3a} - Avalonia.Visuals - - - {3e53a01a-b331-47f3-b828-4a5717e77a24} - Avalonia.Markup.Xaml - - - {6417e941-21bc-467b-a771-0de389353ce6} - Avalonia.Markup - - - {3e908f67-5543-4879-a1dc-08eace79b3cd} - Avalonia.Direct2D1 - - - {811a76cf-1cf6-440f-963b-bbe31bd72a82} - Avalonia.Win32 - + - - true - + - - \ No newline at end of file + diff --git a/src/Windows/Avalonia.Win32.Interop/Properties/AssemblyInfo.cs b/src/Windows/Avalonia.Win32.Interop/Properties/AssemblyInfo.cs deleted file mode 100644 index 7c0d638381..0000000000 --- a/src/Windows/Avalonia.Win32.Interop/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("Avalonia.Win32.Interop")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Avalonia.Win32.Interop")] -[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("cbc4ff2f-92d4-420b-be21-9fe0b930b04e")] - -// 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/src/Windows/Avalonia.Win32/Avalonia.Win32.Shared.shproj b/src/Windows/Avalonia.Win32/Avalonia.Win32.Shared.shproj deleted file mode 100644 index 676400f06d..0000000000 --- a/src/Windows/Avalonia.Win32/Avalonia.Win32.Shared.shproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - 9defc6b7-845b-4d8f-afc0-d32bf0032b8c - 14.0 - - - - - - - - diff --git a/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj b/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj index 1f7b46b7aa..a4842c2756 100644 --- a/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj +++ b/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj @@ -1,112 +1,19 @@ - - + - Debug - AnyCPU - 8.0.30703 - 2.0 - {4488AD85-1495-4809-9AA4-DDFE0A48527E} - {FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Library - Avalonia.iOS - Resources - Avalonia.iOS - - - true - full - false - bin\iPhone\Debug - DEBUG - prompt - 4 - false - true - iPhone Developer - true - - - none - true - bin\iPhone\Release - prompt - 4 - false - iPhone Developer + xamarin.ios10 true - - true - - - - - - - - - - - - - - - - - - - - - - - - - {d211e587-d8bc-45b9-95a4-f297c8fa5200} - Avalonia.Animation - - - {b09b78d8-9b26-48b0-9149-d64a2f120f3f} - Avalonia.Base - - - {d2221c82-4a25-4583-9b43-d791e3f6820c} - Avalonia.Controls - - - {62024b2d-53eb-4638-b26b-85eeaa54866e} - Avalonia.Input - - - {6b0ed19d-a08b-461c-a9d9-a9ee40b0c06b} - Avalonia.Interactivity - - - {42472427-4774-4c81-8aff-9f27b8e31721} - Avalonia.Layout - - - {eb582467-6abb-43a1-b052-e981ba910e3a} - Avalonia.Visuals - - - {f1baa01a-f176-4c6a-b39d-5b40bb1b148f} - Avalonia.Styling - - - {7d2d3083-71dd-4cc9-8907-39a0d86fb322} - Avalonia.Skia - false - false - - - - - - + + + + + + + + - diff --git a/src/iOS/Avalonia.iOS/Properties/AssemblyInfo.cs b/src/iOS/Avalonia.iOS/Properties/AssemblyInfo.cs deleted file mode 100644 index bc671bf54b..0000000000 --- a/src/iOS/Avalonia.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("Avalonia.iOS")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Avalonia.iOS")] -[assembly: AssemblyCopyright("Copyright © 2015")] -[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("4488ad85-1495-4809-9aa4-ddfe0a48527e")] - -// 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/src/iOS/Avalonia.iOS/iOSPlatform.cs b/src/iOS/Avalonia.iOS/iOSPlatform.cs index 7958b2e135..91e3bcc041 100644 --- a/src/iOS/Avalonia.iOS/iOSPlatform.cs +++ b/src/iOS/Avalonia.iOS/iOSPlatform.cs @@ -5,7 +5,6 @@ using Avalonia.Input.Platform; using Avalonia.iOS; using Avalonia.Platform; using Avalonia.Shared.PlatformSupport; -using Avalonia.Skia; using UIKit; using Avalonia.Controls; using Avalonia.Rendering; @@ -19,22 +18,6 @@ namespace Avalonia builder.UseWindowingSubsystem(iOSPlatform.Initialize, "iOS"); return builder; } - /* - // TODO: Can we merge this with UseSkia somehow once HW/platform cleanup is done? - public static T UseSkiaViewHost(this T builder) where T : AppBuilderBase, new() - { - var window = new UIWindow(UIScreen.MainScreen.Bounds); - var controller = new AvaloniaViewController(window); - window.RootViewController = controller; - window.MakeKeyAndVisible(); - - AvaloniaLocator.CurrentMutable - .Bind().ToConstant(new WindowingPlatformImpl(controller.AvaloniaView)); - - SkiaPlatform.Initialize(); - - return builder; - }*/ } }