diff --git a/Avalonia.sln b/Avalonia.sln index 06c3e051ac..84b50a87fa 100644 --- a/Avalonia.sln +++ b/Avalonia.sln @@ -83,21 +83,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Props", "Props", "{F3AC8BC1 build\AnalyzerProject.targets = build\AnalyzerProject.targets build\AvaloniaPublicKey.props = build\AvaloniaPublicKey.props build\Base.props = build\Base.props - build\Binding.props = build\Binding.props build\CoreLibraries.props = build\CoreLibraries.props build\DevAnalyzers.props = build\DevAnalyzers.props build\EmbedXaml.props = build\EmbedXaml.props build\HarfBuzzSharp.props = build\HarfBuzzSharp.props - build\ImageSharp.props = build\ImageSharp.props - build\Microsoft.CSharp.props = build\Microsoft.CSharp.props - build\Microsoft.Reactive.Testing.props = build\Microsoft.Reactive.Testing.props - build\Moq.props = build\Moq.props build\NetAnalyzers.props = build\NetAnalyzers.props - build\NetCore.props = build\NetCore.props - build\NetFX.props = build\NetFX.props build\NullableEnable.props = build\NullableEnable.props build\ReferenceCoreLibraries.props = build\ReferenceCoreLibraries.props - build\Rx.props = build\Rx.props build\SampleApp.props = build\SampleApp.props build\SharedVersion.props = build\SharedVersion.props build\SkiaSharp.props = build\SkiaSharp.props @@ -113,7 +105,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Targets", "Targets", "{4D6F ProjectSection(SolutionItems) = preProject build\BuildTargets.targets = build\BuildTargets.targets build\DevSingleProject.targets = build\DevSingleProject.targets - build\LegacyProject.targets = build\LegacyProject.targets build\UnitTests.NetCore.targets = build\UnitTests.NetCore.targets EndProjectSection EndProject diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 0000000000..96d6f314d8 --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,76 @@ + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/NOTICE.md b/NOTICE.md index 7083706c3e..365f5223fe 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -26,30 +26,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# SharpDX - -https://github.com/sharpdx/SharpDX - -Copyright (c) 2010-2014 SharpDX - Alexandre Mutel - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. - # Silverlight Toolkit https://github.com/microsoftarchive/SilverlightToolkit diff --git a/NuGet.Config b/NuGet.Config index 93d7ba8778..a065192b33 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -8,6 +8,12 @@ + + + + + + diff --git a/build/AnalyzerProject.targets b/build/AnalyzerProject.targets index 4a95cb306e..5bf69d62d2 100644 --- a/build/AnalyzerProject.targets +++ b/build/AnalyzerProject.targets @@ -8,7 +8,7 @@ - + diff --git a/build/Base.props b/build/Base.props index ab5853fcfa..cd0aa8196e 100644 --- a/build/Base.props +++ b/build/Base.props @@ -1,8 +1,8 @@  - - - + + + diff --git a/build/Binding.props b/build/Binding.props deleted file mode 100644 index 9e19e86d89..0000000000 --- a/build/Binding.props +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/build/HarfBuzzSharp.props b/build/HarfBuzzSharp.props index c7a3d753f2..7e0b4e3e19 100644 --- a/build/HarfBuzzSharp.props +++ b/build/HarfBuzzSharp.props @@ -1,7 +1,7 @@  - - - + + + diff --git a/build/ImageSharp.props b/build/ImageSharp.props deleted file mode 100644 index cf401630b0..0000000000 --- a/build/ImageSharp.props +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/build/LegacyProject.targets b/build/LegacyProject.targets deleted file mode 100644 index 0e0d49b1c2..0000000000 --- a/build/LegacyProject.targets +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/build/Microsoft.CSharp.props b/build/Microsoft.CSharp.props deleted file mode 100644 index 4f738dd254..0000000000 --- a/build/Microsoft.CSharp.props +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/build/Microsoft.Reactive.Testing.props b/build/Microsoft.Reactive.Testing.props deleted file mode 100644 index c39c72df77..0000000000 --- a/build/Microsoft.Reactive.Testing.props +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/build/Moq.props b/build/Moq.props deleted file mode 100644 index fc659f7f5f..0000000000 --- a/build/Moq.props +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/build/NetCore.props b/build/NetCore.props deleted file mode 100644 index b9cde28015..0000000000 --- a/build/NetCore.props +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/build/NetFX.props b/build/NetFX.props deleted file mode 100644 index 14adb54035..0000000000 --- a/build/NetFX.props +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/build/Rx.props b/build/Rx.props deleted file mode 100644 index 462428c286..0000000000 --- a/build/Rx.props +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/build/SampleApp.props b/build/SampleApp.props index 3f44553d2d..6816a38cbe 100644 --- a/build/SampleApp.props +++ b/build/SampleApp.props @@ -14,7 +14,7 @@ - + diff --git a/build/SharpDX.props b/build/SharpDX.props deleted file mode 100644 index ff521977fd..0000000000 --- a/build/SharpDX.props +++ /dev/null @@ -1,14 +0,0 @@ - - - 4.0.1 - - - - - - - - - - - diff --git a/build/SkiaSharp.props b/build/SkiaSharp.props index 0dc94b3239..c2b04d3026 100644 --- a/build/SkiaSharp.props +++ b/build/SkiaSharp.props @@ -1,7 +1,7 @@  - - - + + + diff --git a/build/UnitTests.NetFX.props b/build/UnitTests.NetFX.props index e9a29d80fe..22c40ecbbb 100644 --- a/build/UnitTests.NetFX.props +++ b/build/UnitTests.NetFX.props @@ -1,5 +1,4 @@ - PreserveNewest diff --git a/build/XUnit.props b/build/XUnit.props index 5c63ed69db..42b5cae7dc 100644 --- a/build/XUnit.props +++ b/build/XUnit.props @@ -1,7 +1,7 @@  - + diff --git a/build/readme.md b/build/readme.md index e147556b1c..46399914f4 100644 --- a/build/readme.md +++ b/build/readme.md @@ -4,12 +4,6 @@ - - - - - - diff --git a/dirs.proj b/dirs.proj index 084fd30475..20df84439e 100644 --- a/dirs.proj +++ b/dirs.proj @@ -22,7 +22,4 @@ - - - diff --git a/nukebuild/_build.csproj b/nukebuild/_build.csproj index c3ee103e73..92f71351c4 100644 --- a/nukebuild/_build.csproj +++ b/nukebuild/_build.csproj @@ -10,12 +10,12 @@ - - + + - - - + + + diff --git a/packages/Avalonia/Avalonia.csproj b/packages/Avalonia/Avalonia.csproj index e59e72f13b..f86a03133a 100644 --- a/packages/Avalonia/Avalonia.csproj +++ b/packages/Avalonia/Avalonia.csproj @@ -5,7 +5,7 @@ - + @@ -71,7 +71,6 @@ - diff --git a/samples/BindingDemo/BindingDemo.csproj b/samples/BindingDemo/BindingDemo.csproj index b12e350814..c38710a5f8 100644 --- a/samples/BindingDemo/BindingDemo.csproj +++ b/samples/BindingDemo/BindingDemo.csproj @@ -10,10 +10,11 @@ + + + - - diff --git a/samples/ControlCatalog.Android/ControlCatalog.Android.csproj b/samples/ControlCatalog.Android/ControlCatalog.Android.csproj index c2fe16970a..a630799c05 100644 --- a/samples/ControlCatalog.Android/ControlCatalog.Android.csproj +++ b/samples/ControlCatalog.Android/ControlCatalog.Android.csproj @@ -25,7 +25,7 @@ - + diff --git a/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj b/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj index c951862ad2..73b983f788 100644 --- a/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj +++ b/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj @@ -26,7 +26,7 @@ - + diff --git a/samples/Generators.Sandbox/Generators.Sandbox.csproj b/samples/Generators.Sandbox/Generators.Sandbox.csproj index 5a21bab3e0..2654e1b5b6 100644 --- a/samples/Generators.Sandbox/Generators.Sandbox.csproj +++ b/samples/Generators.Sandbox/Generators.Sandbox.csproj @@ -20,7 +20,7 @@ - + diff --git a/samples/GpuInterop/GpuInterop.csproj b/samples/GpuInterop/GpuInterop.csproj index d952e60524..54428bce72 100644 --- a/samples/GpuInterop/GpuInterop.csproj +++ b/samples/GpuInterop/GpuInterop.csproj @@ -27,13 +27,13 @@ - - - - - + + + + + - + diff --git a/samples/IntegrationTestApp/IntegrationTestApp.csproj b/samples/IntegrationTestApp/IntegrationTestApp.csproj index 7e45643843..95caa4c64e 100644 --- a/samples/IntegrationTestApp/IntegrationTestApp.csproj +++ b/samples/IntegrationTestApp/IntegrationTestApp.csproj @@ -19,8 +19,8 @@ - - + + diff --git a/samples/PlatformSanityChecks/PlatformSanityChecks.csproj b/samples/PlatformSanityChecks/PlatformSanityChecks.csproj index faafd6365f..773813617b 100644 --- a/samples/PlatformSanityChecks/PlatformSanityChecks.csproj +++ b/samples/PlatformSanityChecks/PlatformSanityChecks.csproj @@ -12,5 +12,7 @@ - + + + diff --git a/samples/Previewer/Previewer.csproj b/samples/Previewer/Previewer.csproj index dcc727db8a..e894108c0f 100644 --- a/samples/Previewer/Previewer.csproj +++ b/samples/Previewer/Previewer.csproj @@ -14,7 +14,9 @@ - + + + diff --git a/samples/RenderDemo/App.config b/samples/RenderDemo/App.config index cd4593817b..86ce1ace90 100644 --- a/samples/RenderDemo/App.config +++ b/samples/RenderDemo/App.config @@ -9,14 +9,6 @@ - - - - - - - - diff --git a/samples/RenderDemo/RenderDemo.csproj b/samples/RenderDemo/RenderDemo.csproj index ef6e46dedd..3603ee0d31 100644 --- a/samples/RenderDemo/RenderDemo.csproj +++ b/samples/RenderDemo/RenderDemo.csproj @@ -17,10 +17,11 @@ + + + - - diff --git a/samples/XEmbedSample/XEmbedSample.csproj b/samples/XEmbedSample/XEmbedSample.csproj index 2e34bb2cc7..1b51999ada 100644 --- a/samples/XEmbedSample/XEmbedSample.csproj +++ b/samples/XEmbedSample/XEmbedSample.csproj @@ -8,7 +8,7 @@ - + diff --git a/samples/interop/WindowsInteropTest/App.config b/samples/interop/WindowsInteropTest/App.config deleted file mode 100644 index 4fe7131d2a..0000000000 --- a/samples/interop/WindowsInteropTest/App.config +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Android/Avalonia.Android/Avalonia.Android.csproj b/src/Android/Avalonia.Android/Avalonia.Android.csproj index 0c1100ab5f..befdcbcd5e 100644 --- a/src/Android/Avalonia.Android/Avalonia.Android.csproj +++ b/src/Android/Avalonia.Android/Avalonia.Android.csproj @@ -10,8 +10,8 @@ - - + + diff --git a/src/Avalonia.Base/Avalonia.Base.csproj b/src/Avalonia.Base/Avalonia.Base.csproj index ea1dfd766b..ffaac716b9 100644 --- a/src/Avalonia.Base/Avalonia.Base.csproj +++ b/src/Avalonia.Base/Avalonia.Base.csproj @@ -11,7 +11,6 @@ - @@ -24,6 +23,10 @@ + + + + diff --git a/src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj b/src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj index bc6380a012..cf59791653 100644 --- a/src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj +++ b/src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj @@ -129,9 +129,9 @@ - - - + + + diff --git a/src/Avalonia.FreeDesktop/Avalonia.FreeDesktop.csproj b/src/Avalonia.FreeDesktop/Avalonia.FreeDesktop.csproj index 01611d95ee..91ba686906 100644 --- a/src/Avalonia.FreeDesktop/Avalonia.FreeDesktop.csproj +++ b/src/Avalonia.FreeDesktop/Avalonia.FreeDesktop.csproj @@ -13,8 +13,8 @@ - - + + diff --git a/src/Avalonia.MicroCom/Avalonia.MicroCom.csproj b/src/Avalonia.MicroCom/Avalonia.MicroCom.csproj index 8c4da123f1..17fa827202 100644 --- a/src/Avalonia.MicroCom/Avalonia.MicroCom.csproj +++ b/src/Avalonia.MicroCom/Avalonia.MicroCom.csproj @@ -4,7 +4,7 @@ true - + diff --git a/src/Avalonia.Native/Avalonia.Native.csproj b/src/Avalonia.Native/Avalonia.Native.csproj index 2eb67fe5dd..9f79fad8ff 100644 --- a/src/Avalonia.Native/Avalonia.Native.csproj +++ b/src/Avalonia.Native/Avalonia.Native.csproj @@ -21,7 +21,7 @@ - + diff --git a/src/Headless/Avalonia.Headless.NUnit/Avalonia.Headless.NUnit.csproj b/src/Headless/Avalonia.Headless.NUnit/Avalonia.Headless.NUnit.csproj index e69562e55a..183cbe941d 100644 --- a/src/Headless/Avalonia.Headless.NUnit/Avalonia.Headless.NUnit.csproj +++ b/src/Headless/Avalonia.Headless.NUnit/Avalonia.Headless.NUnit.csproj @@ -5,7 +5,7 @@ - + diff --git a/src/Headless/Avalonia.Headless.Vnc/Avalonia.Headless.Vnc.csproj b/src/Headless/Avalonia.Headless.Vnc/Avalonia.Headless.Vnc.csproj index 299869b5b8..00fbf4e698 100644 --- a/src/Headless/Avalonia.Headless.Vnc/Avalonia.Headless.Vnc.csproj +++ b/src/Headless/Avalonia.Headless.Vnc/Avalonia.Headless.Vnc.csproj @@ -10,8 +10,8 @@ - - + + diff --git a/src/Headless/Avalonia.Headless.XUnit/Avalonia.Headless.XUnit.csproj b/src/Headless/Avalonia.Headless.XUnit/Avalonia.Headless.XUnit.csproj index 4ed3d6674e..15646ea3d6 100644 --- a/src/Headless/Avalonia.Headless.XUnit/Avalonia.Headless.XUnit.csproj +++ b/src/Headless/Avalonia.Headless.XUnit/Avalonia.Headless.XUnit.csproj @@ -5,7 +5,7 @@ - + diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/IncludeXamlIlSre.props b/src/Markup/Avalonia.Markup.Xaml.Loader/IncludeXamlIlSre.props index 8e2a82e47a..03217e9dd9 100644 --- a/src/Markup/Avalonia.Markup.Xaml.Loader/IncludeXamlIlSre.props +++ b/src/Markup/Avalonia.Markup.Xaml.Loader/IncludeXamlIlSre.props @@ -11,6 +11,6 @@ - + diff --git a/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj b/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj index 109cba5850..f2e75c8f6b 100644 --- a/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj +++ b/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj @@ -5,19 +5,19 @@ true - - + + - + all runtime; build; native; contentfiles; analyzers - - + + diff --git a/src/tools/Avalonia.Analyzers.CSharp/Avalonia.Analyzers.CSharp.csproj b/src/tools/Avalonia.Analyzers.CSharp/Avalonia.Analyzers.CSharp.csproj index d98e7708ac..c7331c3ef4 100644 --- a/src/tools/Avalonia.Analyzers.CSharp/Avalonia.Analyzers.CSharp.csproj +++ b/src/tools/Avalonia.Analyzers.CSharp/Avalonia.Analyzers.CSharp.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/tools/Avalonia.Analyzers.CodeFixes.CSharp/Avalonia.Analyzers.CodeFixes.CSharp.csproj b/src/tools/Avalonia.Analyzers.CodeFixes.CSharp/Avalonia.Analyzers.CodeFixes.CSharp.csproj index 62ff2316dd..0b23c19781 100644 --- a/src/tools/Avalonia.Analyzers.CodeFixes.CSharp/Avalonia.Analyzers.CodeFixes.CSharp.csproj +++ b/src/tools/Avalonia.Analyzers.CodeFixes.CSharp/Avalonia.Analyzers.CodeFixes.CSharp.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/src/tools/Avalonia.Analyzers.VisualBasic/Avalonia.Analyzers.VisualBasic.csproj b/src/tools/Avalonia.Analyzers.VisualBasic/Avalonia.Analyzers.VisualBasic.csproj index 0245b3920e..b081c485a4 100644 --- a/src/tools/Avalonia.Analyzers.VisualBasic/Avalonia.Analyzers.VisualBasic.csproj +++ b/src/tools/Avalonia.Analyzers.VisualBasic/Avalonia.Analyzers.VisualBasic.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/tools/Avalonia.Generators/Avalonia.Generators.csproj b/src/tools/Avalonia.Generators/Avalonia.Generators.csproj index 32ff60dbb1..7f606866eb 100644 --- a/src/tools/Avalonia.Generators/Avalonia.Generators.csproj +++ b/src/tools/Avalonia.Generators/Avalonia.Generators.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/tools/DevAnalyzers/DevAnalyzers.csproj b/src/tools/DevAnalyzers/DevAnalyzers.csproj index ab850b6ecb..5b216fb96b 100644 --- a/src/tools/DevAnalyzers/DevAnalyzers.csproj +++ b/src/tools/DevAnalyzers/DevAnalyzers.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/tools/DevGenerators/DevGenerators.csproj b/src/tools/DevGenerators/DevGenerators.csproj index ca28548268..3e2cdfef63 100644 --- a/src/tools/DevGenerators/DevGenerators.csproj +++ b/src/tools/DevGenerators/DevGenerators.csproj @@ -7,7 +7,7 @@ - + diff --git a/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj b/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj index c7cb21798c..526f26806f 100644 --- a/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj +++ b/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj @@ -7,10 +7,7 @@ - - - @@ -19,7 +16,10 @@ - + + + + diff --git a/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj b/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj index 9406aaf3f7..b4d7435a28 100644 --- a/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj +++ b/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj @@ -16,7 +16,7 @@ - + diff --git a/tests/Avalonia.Build.Tasks.UnitTest/Avalonia.Build.Tasks.UnitTest.csproj b/tests/Avalonia.Build.Tasks.UnitTest/Avalonia.Build.Tasks.UnitTest.csproj index f0c0c5b3aa..255f2eaff4 100644 --- a/tests/Avalonia.Build.Tasks.UnitTest/Avalonia.Build.Tasks.UnitTest.csproj +++ b/tests/Avalonia.Build.Tasks.UnitTest/Avalonia.Build.Tasks.UnitTest.csproj @@ -9,8 +9,6 @@ Debug - - @@ -25,8 +23,10 @@ - - + + + + diff --git a/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj b/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj index 75e15a71d8..a92ba0dc83 100644 --- a/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj +++ b/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj @@ -6,14 +6,16 @@ - - - + + + + + diff --git a/tests/Avalonia.DesignerSupport.Tests/Avalonia.DesignerSupport.Tests.csproj b/tests/Avalonia.DesignerSupport.Tests/Avalonia.DesignerSupport.Tests.csproj index 4e7f7a641a..a2108b84c5 100644 --- a/tests/Avalonia.DesignerSupport.Tests/Avalonia.DesignerSupport.Tests.csproj +++ b/tests/Avalonia.DesignerSupport.Tests/Avalonia.DesignerSupport.Tests.csproj @@ -5,11 +5,13 @@ $(MSBuildThisFileDirectory)Remote/HtmlTransport/webapp - - - + + + + + diff --git a/tests/Avalonia.Generators.Tests/Avalonia.Generators.Tests.csproj b/tests/Avalonia.Generators.Tests/Avalonia.Generators.Tests.csproj index 697f85b5bf..5c3a961ef1 100644 --- a/tests/Avalonia.Generators.Tests/Avalonia.Generators.Tests.csproj +++ b/tests/Avalonia.Generators.Tests/Avalonia.Generators.Tests.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/tests/Avalonia.Headless.NUnit.PerAssembly.UnitTests/Avalonia.Headless.NUnit.PerAssembly.UnitTests.csproj b/tests/Avalonia.Headless.NUnit.PerAssembly.UnitTests/Avalonia.Headless.NUnit.PerAssembly.UnitTests.csproj index 2a2ad17626..9eff9a967d 100644 --- a/tests/Avalonia.Headless.NUnit.PerAssembly.UnitTests/Avalonia.Headless.NUnit.PerAssembly.UnitTests.csproj +++ b/tests/Avalonia.Headless.NUnit.PerAssembly.UnitTests/Avalonia.Headless.NUnit.PerAssembly.UnitTests.csproj @@ -9,14 +9,14 @@ - - - - - + + + + + diff --git a/tests/Avalonia.Headless.NUnit.PerTest.UnitTests/Avalonia.Headless.NUnit.PerTest.UnitTests.csproj b/tests/Avalonia.Headless.NUnit.PerTest.UnitTests/Avalonia.Headless.NUnit.PerTest.UnitTests.csproj index 2a2ad17626..9eff9a967d 100644 --- a/tests/Avalonia.Headless.NUnit.PerTest.UnitTests/Avalonia.Headless.NUnit.PerTest.UnitTests.csproj +++ b/tests/Avalonia.Headless.NUnit.PerTest.UnitTests/Avalonia.Headless.NUnit.PerTest.UnitTests.csproj @@ -9,14 +9,14 @@ - - - - - + + + + + diff --git a/tests/Avalonia.Headless.XUnit.PerAssembly.UnitTests/Avalonia.Headless.XUnit.PerAssembly.UnitTests.csproj b/tests/Avalonia.Headless.XUnit.PerAssembly.UnitTests/Avalonia.Headless.XUnit.PerAssembly.UnitTests.csproj index 270e078ed3..28cf0b8495 100644 --- a/tests/Avalonia.Headless.XUnit.PerAssembly.UnitTests/Avalonia.Headless.XUnit.PerAssembly.UnitTests.csproj +++ b/tests/Avalonia.Headless.XUnit.PerAssembly.UnitTests/Avalonia.Headless.XUnit.PerAssembly.UnitTests.csproj @@ -8,11 +8,14 @@ - - + + + + + diff --git a/tests/Avalonia.Headless.XUnit.PerTest.UnitTests/Avalonia.Headless.XUnit.PerTest.UnitTests.csproj b/tests/Avalonia.Headless.XUnit.PerTest.UnitTests/Avalonia.Headless.XUnit.PerTest.UnitTests.csproj index 270e078ed3..28cf0b8495 100644 --- a/tests/Avalonia.Headless.XUnit.PerTest.UnitTests/Avalonia.Headless.XUnit.PerTest.UnitTests.csproj +++ b/tests/Avalonia.Headless.XUnit.PerTest.UnitTests/Avalonia.Headless.XUnit.PerTest.UnitTests.csproj @@ -8,11 +8,14 @@ - - + + + + + diff --git a/tests/Avalonia.IntegrationTests.Appium/Avalonia.IntegrationTests.Appium.csproj b/tests/Avalonia.IntegrationTests.Appium/Avalonia.IntegrationTests.Appium.csproj index ade9f7a531..dfb325e414 100644 --- a/tests/Avalonia.IntegrationTests.Appium/Avalonia.IntegrationTests.Appium.csproj +++ b/tests/Avalonia.IntegrationTests.Appium/Avalonia.IntegrationTests.Appium.csproj @@ -21,23 +21,22 @@ - - - + + + - - - + + + + - - diff --git a/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj b/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj index 0826b4babf..0c74cfe0bf 100644 --- a/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj +++ b/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj @@ -3,11 +3,12 @@ $(AvsCurrentTargetFramework) Exe - - + + + diff --git a/tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.csproj b/tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.csproj index 0f97c22721..56f877c557 100644 --- a/tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.csproj +++ b/tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.csproj @@ -6,12 +6,14 @@ - - - + + + + + diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj b/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj index ce33d93e09..60fd896c0d 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj +++ b/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj @@ -6,12 +6,14 @@ - - - + + + + + diff --git a/tests/Avalonia.RenderTests.WpfCompare/Avalonia.RenderTests.WpfCompare.csproj b/tests/Avalonia.RenderTests.WpfCompare/Avalonia.RenderTests.WpfCompare.csproj index 637bdff482..66e547e0ba 100644 --- a/tests/Avalonia.RenderTests.WpfCompare/Avalonia.RenderTests.WpfCompare.csproj +++ b/tests/Avalonia.RenderTests.WpfCompare/Avalonia.RenderTests.WpfCompare.csproj @@ -16,12 +16,12 @@ - + + + + - - - diff --git a/tests/Avalonia.Skia.RenderTests/Avalonia.Skia.RenderTests.csproj b/tests/Avalonia.Skia.RenderTests/Avalonia.Skia.RenderTests.csproj index 4ebb9bfba9..f13d888bb2 100644 --- a/tests/Avalonia.Skia.RenderTests/Avalonia.Skia.RenderTests.csproj +++ b/tests/Avalonia.Skia.RenderTests/Avalonia.Skia.RenderTests.csproj @@ -31,10 +31,12 @@ - - + + + + + - diff --git a/tests/Avalonia.Skia.UnitTests/Avalonia.Skia.UnitTests.csproj b/tests/Avalonia.Skia.UnitTests/Avalonia.Skia.UnitTests.csproj index 184c825328..1edcbfa5aa 100644 --- a/tests/Avalonia.Skia.UnitTests/Avalonia.Skia.UnitTests.csproj +++ b/tests/Avalonia.Skia.UnitTests/Avalonia.Skia.UnitTests.csproj @@ -4,12 +4,14 @@ Exe - - - + + + + + diff --git a/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj b/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj index 66e0fb0719..ff2c3ba658 100644 --- a/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj +++ b/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj @@ -18,8 +18,10 @@ - - + + + + diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props index 8d2d48bfb6..88eb3593e3 100644 --- a/tests/Directory.Build.props +++ b/tests/Directory.Build.props @@ -7,6 +7,6 @@ - +