diff --git a/Avalonia.sln b/Avalonia.sln
index ad14483b40..c2ba081fc0 100644
--- a/Avalonia.sln
+++ b/Avalonia.sln
@@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26228.4
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Base", "src\Avalonia.Base\Avalonia.Base.csproj", "{B09B78D8-9B26-48B0-9149-D64A2F120F3F}"
EndProject
diff --git a/samples/BindingTest/BindingTest.csproj b/samples/BindingTest/BindingTest.csproj
index 49cde9efdb..d8663f5031 100644
--- a/samples/BindingTest/BindingTest.csproj
+++ b/samples/BindingTest/BindingTest.csproj
@@ -166,8 +166,11 @@
-->
-
-
+
+
+ 2.1.0
+
+
diff --git a/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj b/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj
index 31b3360a15..bd0e56e3e6 100644
--- a/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj
+++ b/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj
@@ -149,6 +149,9 @@
-->
-
+
+
+ 2.1.0
+
\ No newline at end of file
diff --git a/samples/ControlCatalog/ControlCatalog.csproj b/samples/ControlCatalog/ControlCatalog.csproj
index 877c686a8b..80e1f591ea 100644
--- a/samples/ControlCatalog/ControlCatalog.csproj
+++ b/samples/ControlCatalog/ControlCatalog.csproj
@@ -234,6 +234,6 @@
-->
-
+
\ No newline at end of file
diff --git a/samples/RenderTest/RenderTest.csproj b/samples/RenderTest/RenderTest.csproj
index c8887f1a5d..b60eb7ab36 100644
--- a/samples/RenderTest/RenderTest.csproj
+++ b/samples/RenderTest/RenderTest.csproj
@@ -66,7 +66,6 @@
-
@@ -188,8 +187,11 @@
-->
-
-
+
+
+ 2.1.0
+
+
diff --git a/samples/VirtualizationTest/VirtualizationTest.csproj b/samples/VirtualizationTest/VirtualizationTest.csproj
index 0c109d4544..0ed2b9d9bd 100644
--- a/samples/VirtualizationTest/VirtualizationTest.csproj
+++ b/samples/VirtualizationTest/VirtualizationTest.csproj
@@ -163,8 +163,11 @@
-->
-
-
+
+
+ 2.1.0
+
+
diff --git a/src/Android/Avalonia.Android/Resources/Resource.Designer.cs b/src/Android/Avalonia.Android/Resources/Resource.Designer.cs
index 80cbbc51ec..e66c2800d3 100644
--- a/src/Android/Avalonia.Android/Resources/Resource.Designer.cs
+++ b/src/Android/Avalonia.Android/Resources/Resource.Designer.cs
@@ -40,11 +40,14 @@ namespace Avalonia.Android
public partial class String
{
+ // aapt resource value: 0x7f020002
+ public static int ApplicationName = 2130837506;
+
// aapt resource value: 0x7f020001
- public static int ApplicationName = 2130837505;
+ public static int Hello = 2130837505;
// aapt resource value: 0x7f020000
- public static int Hello = 2130837504;
+ public static int library_name = 2130837504;
static String()
{
diff --git a/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj b/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj
index 3bdf123a02..7ce8879304 100644
--- a/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj
+++ b/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj
@@ -162,8 +162,8 @@
-->
-
-
+
+
diff --git a/src/Android/Avalonia.AndroidTestApplication/Resources/Resource.Designer.cs b/src/Android/Avalonia.AndroidTestApplication/Resources/Resource.Designer.cs
index 3fa0707176..91327cf941 100644
--- a/src/Android/Avalonia.AndroidTestApplication/Resources/Resource.Designer.cs
+++ b/src/Android/Avalonia.AndroidTestApplication/Resources/Resource.Designer.cs
@@ -28,6 +28,7 @@ namespace Avalonia.AndroidTestApplication
{
global::Avalonia.Android.Resource.String.ApplicationName = global::Avalonia.AndroidTestApplication.Resource.String.ApplicationName;
global::Avalonia.Android.Resource.String.Hello = global::Avalonia.AndroidTestApplication.Resource.String.Hello;
+ global::Avalonia.Android.Resource.String.library_name = global::Avalonia.AndroidTestApplication.Resource.String.library_name;
global::Splat.Resource.String.library_name = global::Avalonia.AndroidTestApplication.Resource.String.library_name;
}
diff --git a/src/Avalonia.Animation/Avalonia.Animation.csproj b/src/Avalonia.Animation/Avalonia.Animation.csproj
index 8fd6eb1896..0ede370efc 100644
--- a/src/Avalonia.Animation/Avalonia.Animation.csproj
+++ b/src/Avalonia.Animation/Avalonia.Animation.csproj
@@ -1,20 +1,8 @@
-
-
-
+
- 11.0
- Debug
- AnyCPU
- {D211E587-D8BC-45B9-95A4-F297C8FA5200}
- Library
- Properties
- Avalonia.Animation
- Avalonia.Animation
- en-US
- 512
- {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- Profile7
- v4.5
+ netstandard1.1
+ False
+ false
true
@@ -64,17 +52,6 @@
-
-
-
-
-
diff --git a/src/Avalonia.Base/Avalonia.Base.csproj b/src/Avalonia.Base/Avalonia.Base.csproj
index ce7a2b3aa8..f5c5815124 100644
--- a/src/Avalonia.Base/Avalonia.Base.csproj
+++ b/src/Avalonia.Base/Avalonia.Base.csproj
@@ -1,22 +1,8 @@
-
-
-
+
- 11.0
- Debug
- AnyCPU
- {B09B78D8-9B26-48B0-9149-D64A2F120F3F}
- Library
- Properties
- Avalonia
- Avalonia.Base
- en-US
- 512
- {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- Profile7
- v4.5
-
-
+ netstandard1.1
+ False
+ false
true
@@ -128,18 +114,7 @@
-
-
-
-
-
-
+
diff --git a/src/Avalonia.Controls/Avalonia.Controls.csproj b/src/Avalonia.Controls/Avalonia.Controls.csproj
index 7ee49bb0da..21b29c53f9 100644
--- a/src/Avalonia.Controls/Avalonia.Controls.csproj
+++ b/src/Avalonia.Controls/Avalonia.Controls.csproj
@@ -1,22 +1,8 @@
-
-
-
+
- 11.0
- Debug
- AnyCPU
- {D2221C82-4A25-4583-9B43-D791E3F6820C}
- Library
- Properties
- Avalonia.Controls
- Avalonia.Controls
- en-US
- 512
- {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- Profile7
- v4.5
-
-
+ netstandard1.1
+ False
+ false
true
@@ -215,9 +201,6 @@
-
-
-
{D211E587-D8BC-45B9-95A4-F297C8FA5200}
@@ -248,17 +231,8 @@
Avalonia.Styling
-
-
-
-
+
diff --git a/src/Avalonia.Controls/Utils/UndoRedoHelper.cs b/src/Avalonia.Controls/Utils/UndoRedoHelper.cs
index 71ba3793d1..be4c1aa6c4 100644
--- a/src/Avalonia.Controls/Utils/UndoRedoHelper.cs
+++ b/src/Avalonia.Controls/Utils/UndoRedoHelper.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
-using JetBrains.Annotations;
using Avalonia.Utilities;
namespace Avalonia.Controls.Utils
diff --git a/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj b/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj
index 58a328d405..455c149e30 100644
--- a/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj
+++ b/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj
@@ -1,22 +1,8 @@
-
-
-
+
- 11.0
- Debug
- AnyCPU
- {799A7BB5-3C2C-48B6-85A7-406A12C420DA}
- Library
- Properties
- Avalonia
- Avalonia.DesignerSupport
- en-US
- 512
- {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- Profile7
- v4.5
-
-
+ netstandard1.1
+ False
+ false
true
@@ -94,20 +80,12 @@
-
-
-
-
-
-
-
+
diff --git a/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj b/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj
index 8eee79892b..3321afcc88 100644
--- a/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj
+++ b/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj
@@ -1,22 +1,8 @@
-
-
-
+
- 11.0
- Debug
- AnyCPU
- {7062AE20-5DCC-4442-9645-8195BDECE63E}
- Library
- Properties
- Avalonia.Diagnostics
- Avalonia.Diagnostics
- en-US
- 512
- {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- Profile7
- v4.5
-
-
+ netstandard1.1
+ False
+ false
true
@@ -119,7 +105,6 @@
-
Designer
@@ -127,16 +112,12 @@
Designer
-
-
-
+
diff --git a/src/Avalonia.DotNetCoreRuntime/Avalonia.DotNetCoreRuntime.csproj b/src/Avalonia.DotNetCoreRuntime/Avalonia.DotNetCoreRuntime.csproj
index 8a60d5d9c7..434420e376 100644
--- a/src/Avalonia.DotNetCoreRuntime/Avalonia.DotNetCoreRuntime.csproj
+++ b/src/Avalonia.DotNetCoreRuntime/Avalonia.DotNetCoreRuntime.csproj
@@ -1,22 +1,9 @@
-
-
-
-
- 14.0
- Debug
- AnyCPU
- {7863EA94-F0FB-4386-BF8C-E5BFA761560A}
- Library
- Properties
- Avalonia.DotNetCoreRuntime
- Avalonia.DotNetCoreRuntime
- en-US
- 512
- {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
-
-
- v5.0
-
+
+
+ netstandard1.6
+ False
+ false
+
true
full
@@ -36,10 +23,6 @@
4
bin\Release\Avalonia.DotNetCoreRuntime.XML
-
-
-
-
SharedAssemblyInfo.cs
@@ -77,13 +60,8 @@
+
+
+
-
-
\ No newline at end of file
diff --git a/src/Avalonia.DotNetCoreRuntime/project.json b/src/Avalonia.DotNetCoreRuntime/project.json
deleted file mode 100644
index d6ae90b33b..0000000000
--- a/src/Avalonia.DotNetCoreRuntime/project.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "supports": {},
- "dependencies": {
- "Microsoft.NETCore.Portable.Compatibility": "1.0.1",
- "NETStandard.Library": "1.6.0",
- "System.Threading.ThreadPool": "4.3.0"
- },
- "frameworks": {
- "netstandard1.5": {}
- }
-}
\ No newline at end of file
diff --git a/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj b/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj
index cda64c2bce..e759210820 100644
--- a/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj
+++ b/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj
@@ -1,22 +1,8 @@
-
-
-
+
- 10.0
- Debug
- AnyCPU
- {5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}
- Library
- Properties
- Avalonia.HtmlRenderer
- Avalonia.HtmlRenderer
- en-US
- 512
- {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- Profile7
- v4.5
-
-
+ netstandard1.1
+ False
+ false
true
@@ -35,6 +21,9 @@
prompt
4
+
+
+
@@ -51,6 +40,7 @@
+
@@ -171,28 +161,6 @@
-
-
-
-
-
-
-
-
- This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
-
-
-
-
-
diff --git a/src/Avalonia.HtmlRenderer/Compat/Api.cs b/src/Avalonia.HtmlRenderer/Compat/Api.cs
new file mode 100644
index 0000000000..798b697277
--- /dev/null
+++ b/src/Avalonia.HtmlRenderer/Compat/Api.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace System.Net
+{
+ internal class AsyncCompletedEventArgs
+ {
+ public object UserState { get; set; }
+ public Exception Error { get; set; }
+ public bool Cancelled { get; set; }
+
+ public AsyncCompletedEventArgs(Exception error, bool cancelled, object userState)
+ {
+
+ }
+ }
+
+ class WebException : Exception
+ {
+ public object Response { get; set; }
+ }
+
+ class HttpWebResponse
+ {
+ public HttpStatusCode StatusCode { get; set; }
+ }
+}
diff --git a/src/Avalonia.Input/Avalonia.Input.csproj b/src/Avalonia.Input/Avalonia.Input.csproj
index 161897fcad..3a2c069217 100644
--- a/src/Avalonia.Input/Avalonia.Input.csproj
+++ b/src/Avalonia.Input/Avalonia.Input.csproj
@@ -1,22 +1,8 @@
-
-
-
+
- 11.0
- Debug
- AnyCPU
- {62024B2D-53EB-4638-B26B-85EEAA54866E}
- Library
- Properties
- Avalonia.Input
- Avalonia.Input
- en-US
- 512
- {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- Profile7
- v4.5
-
-
+ netstandard1.1
+ False
+ false
true
@@ -117,19 +103,6 @@
-
-
-
-
-
-
-
diff --git a/src/Avalonia.Input/IInputElement.cs b/src/Avalonia.Input/IInputElement.cs
index 72f03d3ae5..786353f05c 100644
--- a/src/Avalonia.Input/IInputElement.cs
+++ b/src/Avalonia.Input/IInputElement.cs
@@ -1,7 +1,5 @@
// Copyright (c) The Avalonia Project. All rights reserved.
// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System.Diagnostics.Contracts;
using System;
using System.Collections.Generic;
using Avalonia.Interactivity;
diff --git a/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj b/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj
index 32890f590f..68755fa2b8 100644
--- a/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj
+++ b/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj
@@ -1,22 +1,8 @@
-
-
-
+
- 11.0
- Debug
- AnyCPU
- {6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}
- Library
- Properties
- Avalonia.Interactivity
- Avalonia.Interactivity
- en-US
- 512
- {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- Profile7
- v4.5
-
-
+ netstandard1.1
+ False
+ false
true
@@ -76,14 +62,6 @@
-
-
diff --git a/src/Avalonia.Layout/Avalonia.Layout.csproj b/src/Avalonia.Layout/Avalonia.Layout.csproj
index c7938b2859..a3423cb60d 100644
--- a/src/Avalonia.Layout/Avalonia.Layout.csproj
+++ b/src/Avalonia.Layout/Avalonia.Layout.csproj
@@ -1,22 +1,8 @@
-
-
-
+
- 11.0
- Debug
- AnyCPU
- {42472427-4774-4C81-8AFF-9F27B8E31721}
- Library
- Properties
- Avalonia
- Avalonia.Layout
- en-US
- 512
- {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- Profile7
- v4.5
-
-
+ netstandard1.1
+ False
+ false
true
@@ -72,14 +58,6 @@
-
-
diff --git a/src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.csproj b/src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.csproj
index 2e703758ef..c5781c9a1a 100644
--- a/src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.csproj
+++ b/src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.csproj
@@ -1,20 +1,8 @@
-
-
-
+
- 10.0
- Debug
- AnyCPU
- {B61B66A3-B82D-4875-8001-89D3394FE0C9}
- Library
- Properties
- Avalonia.Logging.Serilog
- Avalonia.Logging.Serilog
- en-US
- 512
- {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- Profile7
- v4.5
+ netstandard1.1
+ False
+ false
true
@@ -42,24 +30,13 @@
-
-
-
{b09b78d8-9b26-48b0-9149-d64a2f120f3f}
Avalonia.Base
-
-
-
+
\ No newline at end of file
diff --git a/src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.csproj b/src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.csproj
index 7e65460e40..c5789eddac 100644
--- a/src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.csproj
+++ b/src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.csproj
@@ -1,27 +1,15 @@
-
-
-
+
- 10.0
- Debug
- AnyCPU
- {6417B24E-49C2-4985-8DB2-3AB9D898EC91}
- Library
- Properties
- Avalonia.ReactiveUI
- Avalonia.ReactiveUI
- en-US
- 512
- {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- Profile259
- v4.5
+ netstandard1.1
+ False
+ false
true
full
false
bin\Debug\
- TRACE;DEBUG;MONO PORTABLE
+ TRACE;DEBUG;MONO PORTABLE;NETSTANDARD1_1
prompt
4
@@ -29,15 +17,19 @@
pdbonly
true
bin\Release\
- TRACE;MONO PORTABLE
+ TRACE;MONO PORTABLE;RELEASE;NETSTANDARD1_1
prompt
4
+
+
+
+
@@ -65,9 +57,7 @@
-
- Code
-
+
@@ -86,25 +76,26 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Avalonia.ReactiveUI/Shims.cs b/src/Avalonia.ReactiveUI/Shims.cs
new file mode 100644
index 0000000000..2729a68d6f
--- /dev/null
+++ b/src/Avalonia.ReactiveUI/Shims.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace System.Runtime.Serialization
+{
+ class IgnoreDataMemberAttribute : Attribute
+ {
+ }
+
+ class DataMemberAttribute : Attribute
+ {
+ }
+ class OnDeserializedAttribute : Attribute
+ {
+ }
+
+ class DataContractAttribute : Attribute
+ {
+ }
+
+ class StreamingContext { }
+}
+
+namespace System.Diagnostics.Contracts
+{
+ static class Contract
+ {
+ public static void Requires(bool condition)
+ {
+
+ }
+ }
+}
diff --git a/src/Avalonia.Styling/Avalonia.Styling.csproj b/src/Avalonia.Styling/Avalonia.Styling.csproj
index e6642cbf69..ea35845030 100644
--- a/src/Avalonia.Styling/Avalonia.Styling.csproj
+++ b/src/Avalonia.Styling/Avalonia.Styling.csproj
@@ -1,22 +1,8 @@
-
-
-
+
- 11.0
- Debug
- AnyCPU
- {F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}
- Library
- Properties
- Avalonia
- Avalonia.Styling
- en-US
- 512
- {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- Profile7
- v4.5
-
-
+ netstandard1.1
+ False
+ false
true
@@ -81,11 +67,6 @@
-
-
-
-
-
{d211e587-d8bc-45b9-95a4-f297c8fa5200}
@@ -100,14 +81,10 @@
Avalonia.Visuals
-
-
diff --git a/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj b/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj
index 6d770ed90e..f599e007d5 100644
--- a/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj
+++ b/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj
@@ -1,22 +1,8 @@
-
-
-
+
- 11.0
- Debug
- AnyCPU
- {3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}
- Library
- Properties
- Avalonia.Themes.Default
- Avalonia.Themes.Default
- en-US
- 512
- {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- Profile7
- v4.5
-
-
+ netstandard1.1
+ False
+ false
true
@@ -184,7 +170,6 @@
Designer
-
@@ -198,14 +183,6 @@
Designer
-
-
diff --git a/src/Avalonia.Visuals/Avalonia.Visuals.csproj b/src/Avalonia.Visuals/Avalonia.Visuals.csproj
index 64fbab2307..0834384f90 100644
--- a/src/Avalonia.Visuals/Avalonia.Visuals.csproj
+++ b/src/Avalonia.Visuals/Avalonia.Visuals.csproj
@@ -1,22 +1,8 @@
-
-
-
+
- 11.0
- Debug
- AnyCPU
- {EB582467-6ABB-43A1-B052-E981BA910E3A}
- Library
- Properties
- Avalonia
- Avalonia.Visuals
- en-US
- 512
- {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- Profile7
- v4.5
-
-
+ netstandard1.1
+ False
+ false
true
@@ -168,19 +154,6 @@
-
-
-
-
-
-
-
diff --git a/src/Gtk/Avalonia.Gtk3/Avalonia.Gtk3.csproj b/src/Gtk/Avalonia.Gtk3/Avalonia.Gtk3.csproj
index 958af437a6..ac20833787 100644
--- a/src/Gtk/Avalonia.Gtk3/Avalonia.Gtk3.csproj
+++ b/src/Gtk/Avalonia.Gtk3/Avalonia.Gtk3.csproj
@@ -1,21 +1,8 @@
-
-
-
+
- 14.0
- Debug
- AnyCPU
- {BB1F7BB5-6AD4-4776-94D9-C09D0A972658}
- Library
- Properties
- Avalonia.Gtk3
- Avalonia.Gtk3
- en-US
- 512
- {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
-
-
- v5.0
+ netstandard1.1
+ False
+ false
true
@@ -92,12 +79,4 @@
Avalonia.SceneGraph
-
-
\ No newline at end of file
diff --git a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
index c7be3a0d90..7786272834 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
+++ b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
@@ -1,20 +1,8 @@
-
-
-
+
- 11.0
- Debug
- AnyCPU
- {3E53A01A-B331-47F3-B828-4A5717E77A24}
- Library
- Properties
- Avalonia.Markup.Xaml
- Avalonia.Markup.Xaml
- en-US
- 512
- {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- Profile7
- v4.5
+ netstandard1.1
+ False
+ false
true
@@ -279,10 +267,6 @@
-
-
-
-
{D211E587-D8BC-45B9-95A4-F297C8FA5200}
@@ -326,14 +310,10 @@
-
-
diff --git a/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj b/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj
index 155779fa1f..9240561ba4 100644
--- a/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj
+++ b/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj
@@ -1,20 +1,8 @@
-
-
-
+
- 11.0
- Debug
- AnyCPU
- {6417E941-21BC-467B-A771-0DE389353CE6}
- Library
- Properties
- Avalonia.Markup
- Avalonia.Markup
- en-US
- 512
- {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- Profile7
- v4.5
+ netstandard1.1
+ False
+ false
true
@@ -113,21 +101,12 @@
Avalonia.Styling
-
-
-
-
-
-
-
-
+
diff --git a/src/Shared/PlatformSupport/StandardRuntimePlatform.cs b/src/Shared/PlatformSupport/StandardRuntimePlatform.cs
index e2aafd562b..1f42aec16e 100644
--- a/src/Shared/PlatformSupport/StandardRuntimePlatform.cs
+++ b/src/Shared/PlatformSupport/StandardRuntimePlatform.cs
@@ -13,7 +13,7 @@ namespace Avalonia.Shared.PlatformSupport
{
#if NETSTANDARD
- public void PostThreadPoolItem(Action cb) => ThreadPool.QueueUserWorkItem(_ => cb(), null);
+ public void PostThreadPoolItem(Action cb) => ThreadPool.QueueUserWorkItem(_ => cb(), null);
#else
public Assembly[] GetLoadedAssemblies() => AppDomain.CurrentDomain.GetAssemblies();
public void PostThreadPoolItem(Action cb) => ThreadPool.UnsafeQueueUserWorkItem(_ => cb(), null);
diff --git a/src/Skia/Avalonia.Skia.Desktop.NetStandard/Avalonia.Skia.Desktop.NetStandard.csproj b/src/Skia/Avalonia.Skia.Desktop.NetStandard/Avalonia.Skia.Desktop.NetStandard.csproj
index f421ed04f4..4e8bb06e13 100644
--- a/src/Skia/Avalonia.Skia.Desktop.NetStandard/Avalonia.Skia.Desktop.NetStandard.csproj
+++ b/src/Skia/Avalonia.Skia.Desktop.NetStandard/Avalonia.Skia.Desktop.NetStandard.csproj
@@ -1,21 +1,10 @@
-
-
-
+
- 14.0
- Debug
- AnyCPU
- {7D2D3083-71DD-4CC9-8907-39A0D86FB322}
- Library
- Properties
+ netstandard1.3
+ False
+ false
Avalonia.Skia.Desktop
Avalonia.Skia.Desktop
- en-US
- 512
- {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
-
-
- v5.0
true
@@ -36,15 +25,14 @@
4
true
-
-
-
-
Properties\SharedAssemblyInfo.cs
+
+
+
{b09b78d8-9b26-48b0-9149-d64a2f120f3f}
@@ -77,12 +65,4 @@
-
-
\ No newline at end of file
diff --git a/src/Skia/Avalonia.Skia.Desktop.NetStandard/project.json b/src/Skia/Avalonia.Skia.Desktop.NetStandard/project.json
deleted file mode 100644
index 8615e024b7..0000000000
--- a/src/Skia/Avalonia.Skia.Desktop.NetStandard/project.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "supports": {},
- "dependencies": {
- "Microsoft.NETCore.Portable.Compatibility": "1.0.1",
- "NETStandard.Library": "1.6.0",
- "SkiaSharp": "1.56.1-beta"
- },
- "frameworks": {
- "netstandard1.3": {}
- }
-}
\ No newline at end of file
diff --git a/src/Skia/Avalonia.Skia.Desktop/Avalonia.Skia.Desktop.csproj b/src/Skia/Avalonia.Skia.Desktop/Avalonia.Skia.Desktop.csproj
index fd9d380cd4..164bccc933 100644
--- a/src/Skia/Avalonia.Skia.Desktop/Avalonia.Skia.Desktop.csproj
+++ b/src/Skia/Avalonia.Skia.Desktop/Avalonia.Skia.Desktop.csproj
@@ -104,27 +104,11 @@
Avalonia.Styling
-
-
-
-
-
-
- This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Windows/Avalonia.Designer/Avalonia.Designer.csproj b/src/Windows/Avalonia.Designer/Avalonia.Designer.csproj
index 767ea06c60..b59892f4a4 100644
--- a/src/Windows/Avalonia.Designer/Avalonia.Designer.csproj
+++ b/src/Windows/Avalonia.Designer/Avalonia.Designer.csproj
@@ -132,6 +132,6 @@
-->
-
+
\ No newline at end of file
diff --git a/src/Windows/Avalonia.Win32.NetStandard/Avalonia.Win32.NetStandard.csproj b/src/Windows/Avalonia.Win32.NetStandard/Avalonia.Win32.NetStandard.csproj
index 95d1b8a345..0642bc7754 100644
--- a/src/Windows/Avalonia.Win32.NetStandard/Avalonia.Win32.NetStandard.csproj
+++ b/src/Windows/Avalonia.Win32.NetStandard/Avalonia.Win32.NetStandard.csproj
@@ -1,21 +1,8 @@
-
-
-
+
- 14.0
- Debug
- AnyCPU
- {40759A76-D0F2-464E-8000-6FF0F5C4BD7C}
- Library
- Properties
- Avalonia.Win32
- Avalonia.Win32
- en-US
- 512
- {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
-
-
- v5.0
+ netstandard1.1
+ False
+ false
true
@@ -81,16 +68,5 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Windows/Avalonia.Win32.NetStandard/project.json b/src/Windows/Avalonia.Win32.NetStandard/project.json
deleted file mode 100644
index 74e316ac12..0000000000
--- a/src/Windows/Avalonia.Win32.NetStandard/project.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "supports": {},
- "dependencies": {
- "Microsoft.NETCore.Portable.Compatibility": "1.0.1",
- "NETStandard.Library": "1.6.0",
- "System.Reactive.Core": "3.0.0"
- },
- "frameworks": {
- "netstandard1.1": {}
- }
-}
\ No newline at end of file