From 61d904ceefc5b87fb2a446091282a54be3243773 Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Thu, 28 Nov 2019 09:23:03 -0800 Subject: [PATCH] Update Publish script and NuGet package. --- Desktop.Unix/Desktop.Unix.csproj | 6 +-- Desktop.Win/App.config | 28 +++++++++++ Desktop.Win/Desktop.Win.csproj | 62 +++++++++++------------ Desktop.Win/packages.config | 27 +++++----- ScreenCast.Core/ScreenCast.Core.csproj | 2 +- ScreenCast.Linux/ScreenCast.Linux.csproj | 2 +- ScreenCast.Win/App.config | 28 +++++++++++ ScreenCast.Win/ScreenCast.Win.csproj | 63 +++++++++++------------- ScreenCast.Win/packages.config | 27 +++++----- Server/Server.csproj | 14 +++--- Utilities/Publish.ps1 | 2 +- 11 files changed, 156 insertions(+), 105 deletions(-) diff --git a/Desktop.Unix/Desktop.Unix.csproj b/Desktop.Unix/Desktop.Unix.csproj index 27ce7397..fbc71e00 100644 --- a/Desktop.Unix/Desktop.Unix.csproj +++ b/Desktop.Unix/Desktop.Unix.csproj @@ -32,9 +32,9 @@ - - - + + + diff --git a/Desktop.Win/App.config b/Desktop.Win/App.config index 534b28cf..2b73e0a4 100644 --- a/Desktop.Win/App.config +++ b/Desktop.Win/App.config @@ -33,6 +33,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Desktop.Win/Desktop.Win.csproj b/Desktop.Win/Desktop.Win.csproj index d8aeb2de..c3856b8e 100644 --- a/Desktop.Win/Desktop.Win.csproj +++ b/Desktop.Win/Desktop.Win.csproj @@ -109,8 +109,8 @@ - - ..\packages\MessagePack.1.7.3.7\lib\net47\MessagePack.dll + + ..\packages\MessagePack.1.8.80\lib\net47\MessagePack.dll ..\packages\Microsoft.AspNetCore.Connections.Abstractions.3.0.0\lib\netstandard2.0\Microsoft.AspNetCore.Connections.Abstractions.dll @@ -124,9 +124,8 @@ ..\packages\Microsoft.AspNetCore.Http.Connections.Common.3.0.0\lib\netstandard2.0\Microsoft.AspNetCore.Http.Connections.Common.dll True - - ..\packages\Microsoft.AspNetCore.Http.Features.3.0.0\lib\netstandard2.0\Microsoft.AspNetCore.Http.Features.dll - True + + ..\packages\Microsoft.AspNetCore.Http.Features.3.0.1\lib\netstandard2.0\Microsoft.AspNetCore.Http.Features.dll ..\packages\Microsoft.AspNetCore.SignalR.Client.3.0.0\lib\netstandard2.0\Microsoft.AspNetCore.SignalR.Client.dll @@ -152,41 +151,32 @@ ..\packages\Microsoft.Bcl.AsyncInterfaces.1.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll True - - ..\packages\Microsoft.Extensions.Configuration.3.0.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll - True + + ..\packages\Microsoft.Extensions.Configuration.3.0.1\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll - - ..\packages\Microsoft.Extensions.Configuration.Abstractions.3.0.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll - True + + ..\packages\Microsoft.Extensions.Configuration.Abstractions.3.0.1\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll - - ..\packages\Microsoft.Extensions.Configuration.Binder.3.0.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll - True + + ..\packages\Microsoft.Extensions.Configuration.Binder.3.0.1\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll - - ..\packages\Microsoft.Extensions.DependencyInjection.3.0.0\lib\net461\Microsoft.Extensions.DependencyInjection.dll - True + + ..\packages\Microsoft.Extensions.DependencyInjection.3.0.1\lib\net461\Microsoft.Extensions.DependencyInjection.dll - - ..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll - True + + ..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.0.1\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll - - ..\packages\Microsoft.Extensions.Logging.3.0.0\lib\netstandard2.0\Microsoft.Extensions.Logging.dll - True + + ..\packages\Microsoft.Extensions.Logging.3.0.1\lib\netstandard2.0\Microsoft.Extensions.Logging.dll - - ..\packages\Microsoft.Extensions.Logging.Abstractions.3.0.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll - True + + ..\packages\Microsoft.Extensions.Logging.Abstractions.3.0.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll - - ..\packages\Microsoft.Extensions.Options.3.0.0\lib\netstandard2.0\Microsoft.Extensions.Options.dll - True + + ..\packages\Microsoft.Extensions.Options.3.0.1\lib\netstandard2.0\Microsoft.Extensions.Options.dll - - ..\packages\Microsoft.Extensions.Primitives.3.0.0\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll - True + + ..\packages\Microsoft.Extensions.Primitives.3.0.1\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll @@ -201,8 +191,7 @@ - ..\packages\System.Drawing.Common.4.6.0\lib\net461\System.Drawing.Common.dll - True + ..\packages\System.Drawing.Common.4.6.1\lib\net461\System.Drawing.Common.dll ..\packages\System.IO.Pipelines.4.6.0\lib\netstandard2.0\System.IO.Pipelines.dll @@ -220,6 +209,11 @@ True + + ..\packages\System.Runtime.Serialization.Primitives.4.3.0\lib\net46\System.Runtime.Serialization.Primitives.dll + True + True + ..\packages\System.Text.Encodings.Web.4.6.0\lib\netstandard2.0\System.Text.Encodings.Web.dll True diff --git a/Desktop.Win/packages.config b/Desktop.Win/packages.config index 21c2291e..4bd68b26 100644 --- a/Desktop.Win/packages.config +++ b/Desktop.Win/packages.config @@ -1,32 +1,35 @@  - + - + - - - - - - - - - + + + + + + + + + - + + + + diff --git a/ScreenCast.Core/ScreenCast.Core.csproj b/ScreenCast.Core/ScreenCast.Core.csproj index d919c057..af2bd858 100644 --- a/ScreenCast.Core/ScreenCast.Core.csproj +++ b/ScreenCast.Core/ScreenCast.Core.csproj @@ -35,7 +35,7 @@ - + diff --git a/ScreenCast.Linux/ScreenCast.Linux.csproj b/ScreenCast.Linux/ScreenCast.Linux.csproj index 0ecd178c..115f751d 100644 --- a/ScreenCast.Linux/ScreenCast.Linux.csproj +++ b/ScreenCast.Linux/ScreenCast.Linux.csproj @@ -34,7 +34,7 @@ - + diff --git a/ScreenCast.Win/App.config b/ScreenCast.Win/App.config index 5f2bd3a7..cd030301 100644 --- a/ScreenCast.Win/App.config +++ b/ScreenCast.Win/App.config @@ -33,6 +33,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ScreenCast.Win/ScreenCast.Win.csproj b/ScreenCast.Win/ScreenCast.Win.csproj index a7bd61b1..3f15a3cd 100644 --- a/ScreenCast.Win/ScreenCast.Win.csproj +++ b/ScreenCast.Win/ScreenCast.Win.csproj @@ -106,8 +106,8 @@ Properties\app.manifest - - ..\packages\MessagePack.1.7.3.7\lib\net47\MessagePack.dll + + ..\packages\MessagePack.1.8.80\lib\net47\MessagePack.dll ..\packages\Microsoft.AspNetCore.Connections.Abstractions.3.0.0\lib\netstandard2.0\Microsoft.AspNetCore.Connections.Abstractions.dll @@ -121,9 +121,8 @@ ..\packages\Microsoft.AspNetCore.Http.Connections.Common.3.0.0\lib\netstandard2.0\Microsoft.AspNetCore.Http.Connections.Common.dll True - - ..\packages\Microsoft.AspNetCore.Http.Features.3.0.0\lib\netstandard2.0\Microsoft.AspNetCore.Http.Features.dll - True + + ..\packages\Microsoft.AspNetCore.Http.Features.3.0.1\lib\netstandard2.0\Microsoft.AspNetCore.Http.Features.dll ..\packages\Microsoft.AspNetCore.SignalR.Client.3.0.0\lib\netstandard2.0\Microsoft.AspNetCore.SignalR.Client.dll @@ -149,41 +148,32 @@ ..\packages\Microsoft.Bcl.AsyncInterfaces.1.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll True - - ..\packages\Microsoft.Extensions.Configuration.3.0.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll - True + + ..\packages\Microsoft.Extensions.Configuration.3.0.1\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll - - ..\packages\Microsoft.Extensions.Configuration.Abstractions.3.0.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll - True + + ..\packages\Microsoft.Extensions.Configuration.Abstractions.3.0.1\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll - - ..\packages\Microsoft.Extensions.Configuration.Binder.3.0.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll - True + + ..\packages\Microsoft.Extensions.Configuration.Binder.3.0.1\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll - - ..\packages\Microsoft.Extensions.DependencyInjection.3.0.0\lib\net461\Microsoft.Extensions.DependencyInjection.dll - True + + ..\packages\Microsoft.Extensions.DependencyInjection.3.0.1\lib\net461\Microsoft.Extensions.DependencyInjection.dll - - ..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll - True + + ..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.0.1\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll - - ..\packages\Microsoft.Extensions.Logging.3.0.0\lib\netstandard2.0\Microsoft.Extensions.Logging.dll - True + + ..\packages\Microsoft.Extensions.Logging.3.0.1\lib\netstandard2.0\Microsoft.Extensions.Logging.dll - - ..\packages\Microsoft.Extensions.Logging.Abstractions.3.0.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll - True + + ..\packages\Microsoft.Extensions.Logging.Abstractions.3.0.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll - - ..\packages\Microsoft.Extensions.Options.3.0.0\lib\netstandard2.0\Microsoft.Extensions.Options.dll - True + + ..\packages\Microsoft.Extensions.Options.3.0.1\lib\netstandard2.0\Microsoft.Extensions.Options.dll - - ..\packages\Microsoft.Extensions.Primitives.3.0.0\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll - True + + ..\packages\Microsoft.Extensions.Primitives.3.0.1\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll ..\packages\NAudio.1.9.0\lib\net35\NAudio.dll @@ -209,8 +199,7 @@ - ..\packages\System.Drawing.Common.4.6.0\lib\net461\System.Drawing.Common.dll - True + ..\packages\System.Drawing.Common.4.6.1\lib\net461\System.Drawing.Common.dll ..\packages\System.IO.Pipelines.4.6.0\lib\netstandard2.0\System.IO.Pipelines.dll @@ -227,6 +216,12 @@ ..\packages\System.Runtime.CompilerServices.Unsafe.4.6.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll True + + + ..\packages\System.Runtime.Serialization.Primitives.4.3.0\lib\net46\System.Runtime.Serialization.Primitives.dll + True + True + ..\packages\System.Text.Encodings.Web.4.6.0\lib\netstandard2.0\System.Text.Encodings.Web.dll True diff --git a/ScreenCast.Win/packages.config b/ScreenCast.Win/packages.config index b12ed59b..2206baf0 100644 --- a/ScreenCast.Win/packages.config +++ b/ScreenCast.Win/packages.config @@ -1,36 +1,39 @@  - + - + - - - - - - - - - + + + + + + + + + - + + + + diff --git a/Server/Server.csproj b/Server/Server.csproj index 3e4d3c3b..84b02d66 100644 --- a/Server/Server.csproj +++ b/Server/Server.csproj @@ -63,19 +63,19 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + - + - + diff --git a/Utilities/Publish.ps1 b/Utilities/Publish.ps1 index 66af985c..55ed36eb 100644 --- a/Utilities/Publish.ps1 +++ b/Utilities/Publish.ps1 @@ -8,7 +8,7 @@ Copyright © 2019 Translucency Software. All rights reserved. .EXAMPLE Run it from the Utilities folder (located in the solution directory). - Or run "powershell -f PublishClients.ps1 -rid win10-x64 -outdir path\to\dir -hostname https://mysite.mydomain.com + Or run "powershell -f Publish.ps1 -rid win10-x64 -outdir path\to\dir -hostname https://mysite.mydomain.com #> $ErrorActionPreference = "Stop"