From 445dc210816981a1367e6d3ef086d64bb8e386fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= Date: Tue, 16 Aug 2016 16:12:52 +0200 Subject: [PATCH 01/16] Removed no longer necessary nuget folder --- nuget/.gitignore | 2 - nuget/build-appveyor.ps1 | 35 --------- nuget/build-version.ps1 | 84 --------------------- nuget/build.ps1 | 1 - nuget/include.ps1 | 1 - nuget/template/Avalonia.Android.nuspec | 28 ------- nuget/template/Avalonia.Desktop.nuspec | 30 -------- nuget/template/Avalonia.Skia.Desktop.nuspec | 20 ----- nuget/template/Avalonia.iOS.nuspec | 27 ------- nuget/template/Avalonia.nuspec | 26 ------- 10 files changed, 254 deletions(-) delete mode 100644 nuget/.gitignore delete mode 100644 nuget/build-appveyor.ps1 delete mode 100644 nuget/build-version.ps1 delete mode 100644 nuget/build.ps1 delete mode 100644 nuget/include.ps1 delete mode 100644 nuget/template/Avalonia.Android.nuspec delete mode 100644 nuget/template/Avalonia.Desktop.nuspec delete mode 100644 nuget/template/Avalonia.Skia.Desktop.nuspec delete mode 100644 nuget/template/Avalonia.iOS.nuspec delete mode 100644 nuget/template/Avalonia.nuspec diff --git a/nuget/.gitignore b/nuget/.gitignore deleted file mode 100644 index 32f9557fad..0000000000 --- a/nuget/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -Avalonia -*.nupkg \ No newline at end of file diff --git a/nuget/build-appveyor.ps1 b/nuget/build-appveyor.ps1 deleted file mode 100644 index 1441a6a79a..0000000000 --- a/nuget/build-appveyor.ps1 +++ /dev/null @@ -1,35 +0,0 @@ -$ErrorActionPreference = "Stop" -$scriptpath = $MyInvocation.MyCommand.Path -$dir = Split-Path $scriptpath -Push-Location $dir - - -sv version $env:APPVEYOR_BUILD_NUMBER -#sv version "1-debug" - -sv version 0.4.1-build$version-alpha -sv key $env:myget_key - -. ".\include.ps1" -.\build-version.ps1 $version - -sv reponame $env:APPVEYOR_REPO_NAME -sv repobranch $env:APPVEYOR_REPO_BRANCH -sv pullreq $env:APPVEYOR_PULL_REQUEST_NUMBER - -echo "Checking for publishing" -echo "$reponame $repobranch $pullreq" -if ([string]::IsNullOrWhiteSpace($pullreq)) -{ - echo "Build is not a PR" - if($repobranch -eq "master") - { - echo "Repo branch matched" - foreach($pkg in $Packages) - { - nuget.exe push "$($pkg).$($version).nupkg" $key -Source https://www.myget.org/F/avalonia-ci/api/v2/package - } - } -} - - diff --git a/nuget/build-version.ps1 b/nuget/build-version.ps1 deleted file mode 100644 index c59789ddb8..0000000000 --- a/nuget/build-version.ps1 +++ /dev/null @@ -1,84 +0,0 @@ -$ErrorActionPreference = "Stop" - -. ".\include.ps1" - -foreach($pkg in $Packages) -{ - rm -Force -Recurse .\$pkg -ErrorAction SilentlyContinue -} - -rm -Force -Recurse *.nupkg -ErrorAction SilentlyContinue -Copy-Item template Avalonia -Recurse -sv lib "Avalonia\lib\portable-windows8+net45" -sv build "Avalonia.Desktop\lib\net45" - -sv skia_root "Avalonia.Skia.Desktop" -sv skia_lib "Avalonia.Skia.Desktop\lib\net45" -sv android "Avalonia.Android\lib\MonoAndroid10" -sv ios "Avalonia.iOS\lib\Xamarin.iOS10" - -mkdir $lib -ErrorAction SilentlyContinue -mkdir $build -ErrorAction SilentlyContinue -mkdir $skia_lib -mkdir $android -mkdir $ios - - -Copy-Item ..\src\Avalonia.Animation\bin\Release\Avalonia.Animation.dll $lib -Copy-Item ..\src\Avalonia.Animation\bin\Release\Avalonia.Animation.xml $lib -Copy-Item ..\src\Avalonia.Base\bin\Release\Avalonia.Base.dll $lib -Copy-Item ..\src\Avalonia.Base\bin\Release\Avalonia.Base.xml $lib -Copy-Item ..\src\Avalonia.Controls\bin\Release\Avalonia.Controls.dll $lib -Copy-Item ..\src\Avalonia.Controls\bin\Release\Avalonia.Controls.xml $lib -Copy-Item ..\src\Avalonia.DesignerSupport\bin\Release\Avalonia.DesignerSupport.dll $lib -Copy-Item ..\src\Avalonia.DesignerSupport\bin\Release\Avalonia.DesignerSupport.xml $lib -Copy-Item ..\src\Avalonia.Diagnostics\bin\Release\\Avalonia.Diagnostics.dll $lib -Copy-Item ..\src\Avalonia.Diagnostics\bin\Release\\Avalonia.Diagnostics.xml $lib -Copy-Item ..\src\Avalonia.Input\bin\Release\Avalonia.Input.dll $lib -Copy-Item ..\src\Avalonia.Input\bin\Release\Avalonia.Input.xml $lib -Copy-Item ..\src\Avalonia.Interactivity\bin\Release\Avalonia.Interactivity.dll $lib -Copy-Item ..\src\Avalonia.Interactivity\bin\Release\Avalonia.Interactivity.xml $lib -Copy-Item ..\src\Avalonia.Layout\bin\Release\Avalonia.Layout.dll $lib -Copy-Item ..\src\Avalonia.Layout\bin\Release\Avalonia.Layout.xml $lib -Copy-Item ..\src\Avalonia.Logging.Serilog\bin\Release\Avalonia.Logging.Serilog.dll $lib -Copy-Item ..\src\Avalonia.Logging.Serilog\bin\Release\Avalonia.Logging.Serilog.xml $lib -Copy-Item ..\src\Avalonia.SceneGraph\bin\Release\Avalonia.SceneGraph.dll $lib -Copy-Item ..\src\Avalonia.SceneGraph\bin\Release\Avalonia.SceneGraph.xml $lib -Copy-Item ..\src\Avalonia.Styling\bin\Release\Avalonia.Styling.dll $lib -Copy-Item ..\src\Avalonia.Styling\bin\Release\Avalonia.Styling.xml $lib -Copy-Item ..\src\Avalonia.Themes.Default\bin\Release\Avalonia.Themes.Default.dll $lib -Copy-Item ..\src\Avalonia.Themes.Default\bin\Release\Avalonia.Themes.Default.xml $lib -Copy-Item ..\src\Markup\Avalonia.Markup\bin\Release\Avalonia.Markup.dll $lib -Copy-Item ..\src\Markup\Avalonia.Markup\bin\Release\Avalonia.Markup.xml $lib -Copy-Item ..\src\Markup\Avalonia.Markup.Xaml\bin\Release\Avalonia.Markup.Xaml.dll $lib -Copy-Item ..\src\Markup\Avalonia.Markup.Xaml\bin\Release\Avalonia.Markup.Xaml.xml $lib -Copy-Item ..\src\Avalonia.HtmlRenderer\bin\Release\Avalonia.HtmlRenderer.dll $lib -Copy-Item ..\src\Avalonia.ReactiveUI\bin\Release\Avalonia.ReactiveUI.dll $lib - -Copy-Item ..\src\Windows\Avalonia.Direct2D1\bin\Release\Avalonia.Direct2D1.dll $build -Copy-Item ..\src\Windows\Avalonia.Win32\bin\Release\Avalonia.Win32.dll $build -Copy-Item ..\src\Gtk\Avalonia.Gtk\bin\Release\Avalonia.Gtk.dll $build -Copy-Item ..\src\Gtk\Avalonia.Cairo\bin\Release\Avalonia.Cairo.dll $build - -Copy-Item ..\src\Skia\Avalonia.Skia.Desktop\bin\x86\Release\Avalonia.Skia.Desktop.dll $skia_lib - -Copy-Item ..\src\Android\Avalonia.Android\bin\Release\Avalonia.Android.dll $android -Copy-Item ..\src\Skia\Avalonia.Skia.Android\bin\Release\Avalonia.Skia.Android.dll $android - -Copy-Item ..\src\iOS\Avalonia.iOS\bin\iPhone\Release\Avalonia.iOS.dll $ios -Copy-Item ..\src\Skia\Avalonia.Skia.iOS\bin\iPhone\Release\Avalonia.Skia.iOS.dll $ios - -foreach($pkg in $Packages) -{ - (gc Avalonia\$pkg.nuspec).replace('#VERSION#', $args[0]) | sc $pkg\$pkg.nuspec -} - -foreach($pkg in $Packages) -{ - nuget.exe pack $pkg\$pkg.nuspec -} - -foreach($pkg in $Packages) -{ - rm -Force -Recurse .\$pkg -} \ No newline at end of file diff --git a/nuget/build.ps1 b/nuget/build.ps1 deleted file mode 100644 index 43c3748bdf..0000000000 --- a/nuget/build.ps1 +++ /dev/null @@ -1 +0,0 @@ -.\build-version.ps1 0.4.1 \ No newline at end of file diff --git a/nuget/include.ps1 b/nuget/include.ps1 deleted file mode 100644 index bde8ebb731..0000000000 --- a/nuget/include.ps1 +++ /dev/null @@ -1 +0,0 @@ -$Packages = @("Avalonia", "Avalonia.Desktop", "Avalonia.Skia.Desktop", "Avalonia.Android", "Avalonia.iOS") \ No newline at end of file diff --git a/nuget/template/Avalonia.Android.nuspec b/nuget/template/Avalonia.Android.nuspec deleted file mode 100644 index cdba3b5b0e..0000000000 --- a/nuget/template/Avalonia.Android.nuspec +++ /dev/null @@ -1,28 +0,0 @@ - - - - Avalonia.Android - #VERSION# - Avalonia Team - stevenk - http://opensource.org/licenses/MIT - https://github.com/AvaloniaUI/Avalonia/ - false - The Avalonia UI framework - - Copyright 2015 - Avalonia - - - - - - - - - - - - - - \ No newline at end of file diff --git a/nuget/template/Avalonia.Desktop.nuspec b/nuget/template/Avalonia.Desktop.nuspec deleted file mode 100644 index 70bebd3349..0000000000 --- a/nuget/template/Avalonia.Desktop.nuspec +++ /dev/null @@ -1,30 +0,0 @@ - - - - Avalonia.Desktop - #VERSION# - Avalonia Team - stevenk - http://opensource.org/licenses/MIT - https://github.com/AvaloniaUI/Avalonia/ - false - The Avalonia UI framework - - Copyright 2015 - Avalonia - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/nuget/template/Avalonia.Skia.Desktop.nuspec b/nuget/template/Avalonia.Skia.Desktop.nuspec deleted file mode 100644 index 928b6d3e24..0000000000 --- a/nuget/template/Avalonia.Skia.Desktop.nuspec +++ /dev/null @@ -1,20 +0,0 @@ - - - - Avalonia.Skia.Desktop - #VERSION# - Avalonia Team - stevenk - http://opensource.org/licenses/MIT - https://github.com/AvaloniaUI/Avalonia/ - false - The Avalonia UI framework - - Copyright 2015 - Avalonia - - - - - - \ No newline at end of file diff --git a/nuget/template/Avalonia.iOS.nuspec b/nuget/template/Avalonia.iOS.nuspec deleted file mode 100644 index d6b8e3fbe6..0000000000 --- a/nuget/template/Avalonia.iOS.nuspec +++ /dev/null @@ -1,27 +0,0 @@ - - - - Avalonia.iOS - #VERSION# - Avalonia Team - stevenk - http://opensource.org/licenses/MIT - https://github.com/AvaloniaUI/Avalonia/ - false - The Avalonia UI framework - - Copyright 2015 - Avalonia - - - - - - - - - - - - - \ No newline at end of file diff --git a/nuget/template/Avalonia.nuspec b/nuget/template/Avalonia.nuspec deleted file mode 100644 index 55918715a1..0000000000 --- a/nuget/template/Avalonia.nuspec +++ /dev/null @@ -1,26 +0,0 @@ - - - - Avalonia - #VERSION# - Avalonia Team - stevenk - http://opensource.org/licenses/MIT - https://github.com/AvaloniaUI/Avalonia/ - false - The Avalonia UI framework - Initial alpha release. - Copyright 2015 - Avalonia - - - - - - - - - - - - \ No newline at end of file From 7cca79b4352d82e4e2ed407e2d7218c6d9d31978 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= Date: Tue, 16 Aug 2016 16:13:31 +0200 Subject: [PATCH 02/16] Updated projects and packages --- samples/BindingTest/BindingTest.csproj | 8 ++-- samples/BindingTest/packages.config | 5 ++- samples/ControlCatalog.Desktop/App.config | 8 ++-- .../ControlCatalog.Desktop.csproj | 10 ++--- .../ControlCatalog.Desktop/packages.config | 3 +- .../ControlCatalog.iOS.csproj | 10 +++++ samples/ControlCatalog.iOS/packages.config | 17 ++++++++ samples/ControlCatalog/ControlCatalog.csproj | 9 ++++ samples/ControlCatalog/packages.config | 13 +++++- .../TestApplication/TestApplication.csproj | 8 +--- samples/TestApplication/packages.config | 2 +- samples/VirtualizationTest/App.config | 8 ++-- .../VirtualizationTest.csproj | 8 ++-- samples/VirtualizationTest/packages.config | 9 ++-- .../XamlTestApplication.csproj | 12 +++--- samples/XamlTestApplication/packages.config | 5 ++- .../Avalonia.AndroidTestApplication.csproj | 9 ++-- .../packages.config | 8 +++- src/Avalonia.Base/Avalonia.Base.csproj | 4 +- src/Avalonia.Base/packages.config | 2 +- .../Avalonia.Controls.csproj | 4 +- src/Avalonia.Controls/packages.config | 2 +- .../Avalonia.Logging.Serilog.csproj | 18 ++++---- src/Avalonia.Logging.Serilog/packages.config | 13 +++++- src/Avalonia.Styling/Avalonia.Styling.csproj | 1 - .../Avalonia.Markup.Xaml.csproj | 4 +- .../Avalonia.Markup.Xaml/packages.config | 2 +- .../Avalonia.Skia.Android.TestApp.csproj | 4 ++ .../Resources/Resource.Designer.cs | 2 + .../Avalonia.Skia.iOS.TestApp.csproj | 8 +++- .../Avalonia.Designer.csproj | 6 +-- src/Windows/Avalonia.Designer/packages.config | 2 +- .../Avalonia.Base.UnitTests.csproj | 8 +++- tests/Avalonia.Base.UnitTests/packages.config | 3 +- tests/Avalonia.Benchmarks/App.config | 2 +- .../Avalonia.Benchmarks.csproj | 43 +++++++++++++++---- tests/Avalonia.Benchmarks/packages.config | 23 ++++++++-- .../Avalonia.Controls.UnitTests.csproj | 16 ++++--- tests/Avalonia.Controls.UnitTests/app.config | 2 +- .../packages.config | 7 +-- .../App.config | 6 +-- .../Avalonia.DesignerSupport.TestApp.csproj | 4 +- .../Properties/Resources.Designer.cs | 42 ++++++++---------- .../Properties/Settings.Designer.cs | 22 ++++------ .../Avalonia.DesignerSupport.Tests.csproj | 3 +- .../Avalonia.Input.UnitTests.csproj | 8 +++- .../Avalonia.Input.UnitTests/packages.config | 3 +- .../Avalonia.Layout.UnitTests.csproj | 16 ++++--- tests/Avalonia.Layout.UnitTests/app.config | 4 +- .../Avalonia.Layout.UnitTests/packages.config | 7 +-- .../Avalonia.LeakTests.csproj | 18 +++++--- tests/Avalonia.LeakTests/app.config | 4 +- tests/Avalonia.LeakTests/packages.config | 9 ++-- .../Avalonia.Markup.UnitTests.csproj | 19 +++++--- tests/Avalonia.Markup.UnitTests/app.config | 8 ++-- .../Avalonia.Markup.UnitTests/packages.config | 27 ++++++------ .../Avalonia.Markup.Xaml.UnitTests.csproj | 14 +++--- .../Avalonia.Markup.Xaml.UnitTests/app.config | 8 ++-- .../packages.config | 5 ++- .../Avalonia.Cairo.RenderTests.csproj | 2 +- .../Avalonia.Direct2D1.RenderTests.csproj | 2 +- .../Avalonia.Skia.RenderTests.csproj | 2 +- .../Controls/ImageTests.cs | 12 ++++++ .../Media/ImageBrushTests.cs | 8 +++- ...packages.Avalonia.Cairo.RenderTests.config | 2 +- ...ages.Avalonia.Direct2D1.RenderTests.config | 2 +- .../packages.Avalonia.Skia.RenderTests.config | 2 +- .../Avalonia.SceneGraph.UnitTests.csproj | 8 +++- .../packages.config | 3 +- .../Avalonia.Styling.UnitTests.csproj | 8 +++- .../packages.config | 3 +- .../Avalonia.UnitTests.csproj | 8 +++- tests/Avalonia.UnitTests/packages.config | 3 +- 73 files changed, 396 insertions(+), 224 deletions(-) create mode 100644 samples/ControlCatalog.iOS/packages.config diff --git a/samples/BindingTest/BindingTest.csproj b/samples/BindingTest/BindingTest.csproj index 3ed2671d0a..5940f358ed 100644 --- a/samples/BindingTest/BindingTest.csproj +++ b/samples/BindingTest/BindingTest.csproj @@ -37,12 +37,12 @@ - - ..\..\packages\Serilog.1.5.14\lib\net45\Serilog.dll + + ..\..\packages\Serilog.2.1.0\lib\net45\Serilog.dll True - - ..\..\packages\Serilog.1.5.14\lib\net45\Serilog.FullNetFx.dll + + ..\..\packages\Serilog.Sinks.Trace.2.0.0\lib\net45\Serilog.Sinks.Trace.dll True diff --git a/samples/BindingTest/packages.config b/samples/BindingTest/packages.config index 3c5f85de81..96d41d13ba 100644 --- a/samples/BindingTest/packages.config +++ b/samples/BindingTest/packages.config @@ -1,7 +1,8 @@  - - + + + \ No newline at end of file diff --git a/samples/ControlCatalog.Desktop/App.config b/samples/ControlCatalog.Desktop/App.config index 7ef9d715f8..2231c71e63 100644 --- a/samples/ControlCatalog.Desktop/App.config +++ b/samples/ControlCatalog.Desktop/App.config @@ -1,13 +1,13 @@ - + - + - - + + diff --git a/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj b/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj index f42902b534..e363bea129 100644 --- a/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj +++ b/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj @@ -34,12 +34,12 @@ 4 - - ..\..\packages\Serilog.1.5.14\lib\net45\Serilog.dll + + ..\..\packages\Serilog.2.1.0\lib\net45\Serilog.dll True - - ..\..\packages\Serilog.1.5.14\lib\net45\Serilog.FullNetFx.dll + + ..\..\packages\Serilog.Sinks.Trace.2.0.0\lib\net45\Serilog.Sinks.Trace.dll True @@ -54,10 +54,10 @@ - + diff --git a/samples/ControlCatalog.Desktop/packages.config b/samples/ControlCatalog.Desktop/packages.config index b3abe6f487..9f7215928e 100644 --- a/samples/ControlCatalog.Desktop/packages.config +++ b/samples/ControlCatalog.Desktop/packages.config @@ -1,4 +1,5 @@  - + + \ No newline at end of file diff --git a/samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj b/samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj index 0e85a4e865..73d430e2b6 100644 --- a/samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj +++ b/samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj @@ -90,8 +90,18 @@ + + + + ..\..\packages\Serilog.2.0.0\lib\netstandard1.3\Serilog.dll + True + + + ..\..\packages\Serilog.Sinks.Trace.2.0.0\lib\netstandard1.3\Serilog.Sinks.Trace.dll + True + diff --git a/samples/ControlCatalog.iOS/packages.config b/samples/ControlCatalog.iOS/packages.config new file mode 100644 index 0000000000..7c0b68fc9a --- /dev/null +++ b/samples/ControlCatalog.iOS/packages.config @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/samples/ControlCatalog/ControlCatalog.csproj b/samples/ControlCatalog/ControlCatalog.csproj index daa8b0901a..c8da292ad5 100644 --- a/samples/ControlCatalog/ControlCatalog.csproj +++ b/samples/ControlCatalog/ControlCatalog.csproj @@ -215,6 +215,15 @@ Designer + + + + + + ..\..\packages\Serilog.2.1.0\lib\netstandard1.0\Serilog.dll + True + +