diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 856a8a8..b914e28 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -56,15 +56,6 @@ jobs: logProjectEvents: false createLogFile: false - - task: DotNetCoreCLI@2 - inputs: - command: publish - publishWebProjects: false - projects: src\Uno.Playground.AspnetShell\Uno.Playground.AspnetShell.csproj - arguments: --configuration Release --output $(Build.ArtifactStagingDirectory)/web - zipAfterPublish: true - modifyOutputPath: true - - task: DotNetCoreCLI@2 inputs: command: publish diff --git a/src/Uno.Playground.AspnetShell/.gitignore b/src/Uno.Playground.AspnetShell/.gitignore deleted file mode 100644 index 6f67bda..0000000 --- a/src/Uno.Playground.AspnetShell/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -wwwroot/* - -!wwwroot/*.ico -!wwwroot/google* - diff --git a/src/Uno.Playground.AspnetShell/Program.cs b/src/Uno.Playground.AspnetShell/Program.cs deleted file mode 100644 index 85b044b..0000000 --- a/src/Uno.Playground.AspnetShell/Program.cs +++ /dev/null @@ -1,18 +0,0 @@ -using Microsoft.AspNetCore; -using Microsoft.AspNetCore.Hosting; - -namespace Uno.UI.Demo.AspnetShell -{ - public class Program - { - public static void Main(string[] args) - { - BuildWebHost(args).Run(); - } - - public static IWebHost BuildWebHost(string[] args) => - WebHost.CreateDefaultBuilder(args) - .UseStartup() - .Build(); - } -} diff --git a/src/Uno.Playground.AspnetShell/Startup.cs b/src/Uno.Playground.AspnetShell/Startup.cs deleted file mode 100644 index c2cef76..0000000 --- a/src/Uno.Playground.AspnetShell/Startup.cs +++ /dev/null @@ -1,82 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Net; -using System.Text.RegularExpressions; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Rewrite; -using Microsoft.AspNetCore.StaticFiles; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; - -namespace Uno.UI.Demo.AspnetShell -{ - public class Startup - { - public Startup(IConfiguration configuration) - { - Configuration = configuration; - } - - public IConfiguration Configuration { get; } - - // This method gets called by the runtime. Use this method to add services to the container. - public void ConfigureServices(IServiceCollection services) - { - services.AddResponseCompression(c => - { - c.EnableForHttps = true; - }); - } - - // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IHostingEnvironment env) - { - if (env.IsDevelopment()) - { - app.UseBrowserLink(); - app.UseDeveloperExceptionPage(); - } - else - { - app.UseExceptionHandler("/error.html"); - } - - app.UseResponseCompression(); - - // Static content - app.UseDefaultFiles(); - app.UseStaticFiles(new StaticFileOptions - { - ContentTypeProvider = CreateContentTypeProvider(), - OnPrepareResponse = ConfigureCacheControl - }); - } - - private static void ConfigureCacheControl(StaticFileResponseContext ctx) - { - if (ctx.File.Name.EndsWith(".clr", StringComparison.OrdinalIgnoreCase)) - { - // Cache managed files for a year, based on this update: - // https://github.com/nventive/Uno.Wasm.Bootstrap/commit/f4859452c715c54ac40b968a303a242b0399d59a - ctx.Context.Response.Headers.Append("Cache-Control", "public,max-age=31536000"); - } - } - - private FileExtensionContentTypeProvider CreateContentTypeProvider() - { - var provider = new FileExtensionContentTypeProvider - { - Mappings = - { - [".wasm"] = "application/wasm", - [".clr"] = "application/octet-stream" - } - }; - return provider; - } - } -} diff --git a/src/Uno.Playground.AspnetShell/Uno.Playground.AspnetShell.csproj b/src/Uno.Playground.AspnetShell/Uno.Playground.AspnetShell.csproj deleted file mode 100644 index e9f0d7d..0000000 --- a/src/Uno.Playground.AspnetShell/Uno.Playground.AspnetShell.csproj +++ /dev/null @@ -1,24 +0,0 @@ - - - - netcoreapp2.0 - 3.0 - - - - - - - - - - - - - - - - - - - diff --git a/src/Uno.Playground.AspnetShell/appsettings.Development.json b/src/Uno.Playground.AspnetShell/appsettings.Development.json deleted file mode 100644 index fa8ce71..0000000 --- a/src/Uno.Playground.AspnetShell/appsettings.Development.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "Logging": { - "IncludeScopes": false, - "LogLevel": { - "Default": "Debug", - "System": "Information", - "Microsoft": "Information" - } - } -} diff --git a/src/Uno.Playground.AspnetShell/appsettings.json b/src/Uno.Playground.AspnetShell/appsettings.json deleted file mode 100644 index 8d8fbbe..0000000 --- a/src/Uno.Playground.AspnetShell/appsettings.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "Logging": { - "IncludeScopes": false, - "LogLevel": { - "Default": "Warning" - } - }, - "ConnectionStrings": { - } -} diff --git a/src/Uno.Playground.AspnetShell/web.config b/src/Uno.Playground.AspnetShell/web.config deleted file mode 100644 index 39f261e..0000000 --- a/src/Uno.Playground.AspnetShell/web.config +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Uno.Playground.Droid/Uno.Playground.Droid.csproj b/src/Uno.Playground.Droid/Uno.Playground.Droid.csproj index 62e24f1..9248bb1 100644 --- a/src/Uno.Playground.Droid/Uno.Playground.Droid.csproj +++ b/src/Uno.Playground.Droid/Uno.Playground.Droid.csproj @@ -50,7 +50,7 @@ 4 False SdkOnly - true + false false true false @@ -84,10 +84,10 @@ 1.30.0-dev.102 - 1.26.0-dev.58 + 1.28.0-dev.86 - 1.43.0-dev.619 + 1.45.0-dev.1327 @@ -173,4 +173,4 @@ --> - \ No newline at end of file + diff --git a/src/Uno.Playground.Shared/Samples/Playground.xaml.cs b/src/Uno.Playground.Shared/Samples/Playground.xaml.cs index 1d5a8ef..b15ecb3 100644 --- a/src/Uno.Playground.Shared/Samples/Playground.xaml.cs +++ b/src/Uno.Playground.Shared/Samples/Playground.xaml.cs @@ -118,8 +118,9 @@ namespace Uno.UI.Demo.Samples samples.SelectionChanged += Samples_SelectionChanged; samples.IsEnabled = true; } - catch (Exception) + catch (Exception e) { + Console.WriteLine(e); samples.ItemsSource = new[] {new SampleForDisplay(new SampleCategory(), new Sample {Title = "[Error loading samples]"})}; } } @@ -508,12 +509,7 @@ namespace Uno.UI.Demo.Samples } private static HttpClient CreateHttp() { -#if __WASM__ - var handler = new Wasm.WasmHttpHandler(); - var httpClient = new HttpClient(handler); -#else var httpClient = new HttpClient(); -#endif httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json")); httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("text/json")); return httpClient; diff --git a/src/Uno.Playground.UWP/Uno.Playground.UWP.csproj b/src/Uno.Playground.UWP/Uno.Playground.UWP.csproj index b18b7ae..b98671a 100644 --- a/src/Uno.Playground.UWP/Uno.Playground.UWP.csproj +++ b/src/Uno.Playground.UWP/Uno.Playground.UWP.csproj @@ -20,10 +20,10 @@ 1.30.0-dev.102 - 1.26.0-dev.58 + 1.28.0-dev.86 - 1.43.0-dev.619 + 1.45.0-dev.1327 diff --git a/src/Uno.Playground.WASM/LinkerConfig.xml b/src/Uno.Playground.WASM/LinkerConfig.xml index db691b5..3dc498e 100644 --- a/src/Uno.Playground.WASM/LinkerConfig.xml +++ b/src/Uno.Playground.WASM/LinkerConfig.xml @@ -1,9 +1,8 @@  - - - - + + + - \ No newline at end of file + diff --git a/src/Uno.Playground.AspnetShell/Properties/launchSettings.json b/src/Uno.Playground.WASM/Properties/launchSettings.json similarity index 78% rename from src/Uno.Playground.AspnetShell/Properties/launchSettings.json rename to src/Uno.Playground.WASM/Properties/launchSettings.json index ce305cd..964feeb 100644 --- a/src/Uno.Playground.AspnetShell/Properties/launchSettings.json +++ b/src/Uno.Playground.WASM/Properties/launchSettings.json @@ -3,7 +3,7 @@ "windowsAuthentication": false, "anonymousAuthentication": true, "iisExpress": { - "applicationUrl": "http://localhost:59341/", + "applicationUrl": "http://localhost:51256/", "sslPort": 0 } }, @@ -15,13 +15,13 @@ "ASPNETCORE_ENVIRONMENT": "Development" } }, - "Uno.UI.Demo.AspnetShell": { + "Uno.Playground.WASM": { "commandName": "Project", "launchBrowser": true, "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" }, - "applicationUrl": "http://localhost:59342/" + "applicationUrl": "http://localhost:51258/" } } -} +} \ No newline at end of file diff --git a/src/Uno.Playground.WASM/Uno.Playground.WASM.csproj b/src/Uno.Playground.WASM/Uno.Playground.WASM.csproj index 1118432..9e39033 100644 --- a/src/Uno.Playground.WASM/Uno.Playground.WASM.csproj +++ b/src/Uno.Playground.WASM/Uno.Playground.WASM.csproj @@ -1,4 +1,4 @@ - + Exe @@ -11,6 +11,7 @@ Uno.Playground.WASM NU1701 true + true @@ -27,9 +28,6 @@ - - - @@ -41,10 +39,6 @@ - - - - @@ -59,11 +53,12 @@ runtime; build; native; contentfiles; analyzers - - + + + diff --git a/src/Uno.Playground.WASM/web.config b/src/Uno.Playground.WASM/web.config deleted file mode 100644 index 39f261e..0000000 --- a/src/Uno.Playground.WASM/web.config +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Uno.Playground.iOS/Uno.Playground.iOS.csproj b/src/Uno.Playground.iOS/Uno.Playground.iOS.csproj index a157743..a20bba3 100644 --- a/src/Uno.Playground.iOS/Uno.Playground.iOS.csproj +++ b/src/Uno.Playground.iOS/Uno.Playground.iOS.csproj @@ -185,10 +185,10 @@ 1.30.0-dev.102 - 1.26.0-dev.58 + 1.28.0-dev.86 - 1.43.0-dev.619 + 1.45.0-dev.1327 diff --git a/src/Uno.Playground.sln b/src/Uno.Playground.sln index a4ac29b..1ed0d4a 100644 --- a/src/Uno.Playground.sln +++ b/src/Uno.Playground.sln @@ -1,13 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27130.2036 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.28705.295 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Playground.AspnetShell", "Uno.Playground.AspnetShell\Uno.Playground.AspnetShell.csproj", "{FB046231-9F21-4967-B0F7-88E1A200FC53}" - ProjectSection(ProjectDependencies) = postProject - {25DA869C-40CB-4C9A-A1E8-A685B7D4EA90} = {25DA869C-40CB-4C9A-A1E8-A685B7D4EA90} - EndProjectSection -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Playground.WASM", "Uno.Playground.WASM\Uno.Playground.WASM.csproj", "{25DA869C-40CB-4C9A-A1E8-A685B7D4EA90}" EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Uno.Playground.Shared", "Uno.Playground.Shared\Uno.Playground.Shared.shproj", "{6279C845-92F8-4333-AB99-3D213163593C}" @@ -68,76 +63,6 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {FB046231-9F21-4967-B0F7-88E1A200FC53}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.Ad-Hoc|ARM.Build.0 = Release|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.Ad-Hoc|x64.Build.0 = Release|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.Ad-Hoc|x86.Build.0 = Release|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.AppStore|Any CPU.ActiveCfg = Release|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.AppStore|Any CPU.Build.0 = Release|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.AppStore|ARM.ActiveCfg = Release|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.AppStore|ARM.Build.0 = Release|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.AppStore|iPhone.ActiveCfg = Release|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.AppStore|iPhone.Build.0 = Release|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.AppStore|x64.ActiveCfg = Release|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.AppStore|x64.Build.0 = Release|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.AppStore|x86.ActiveCfg = Release|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.AppStore|x86.Build.0 = Release|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.Debug|ARM.ActiveCfg = Debug|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.Debug|ARM.Build.0 = Debug|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.Debug|iPhone.Build.0 = Debug|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.Debug|x64.ActiveCfg = Debug|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.Debug|x64.Build.0 = Debug|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.Debug|x86.ActiveCfg = Debug|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.Debug|x86.Build.0 = Debug|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.Release_iOS|Any CPU.ActiveCfg = Release|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.Release_iOS|ARM.ActiveCfg = Release|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.Release_iOS|ARM.Build.0 = Release|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.Release_iOS|iPhone.ActiveCfg = Release|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.Release_iOS|iPhone.Build.0 = Release|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.Release_iOS|iPhoneSimulator.ActiveCfg = Release|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.Release_iOS|iPhoneSimulator.Build.0 = Release|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.Release_iOS|x64.ActiveCfg = Release|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.Release_iOS|x64.Build.0 = Release|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.Release_iOS|x86.ActiveCfg = Release|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.Release_iOS|x86.Build.0 = Release|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.Release_UWP|Any CPU.ActiveCfg = Release|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.Release_UWP|ARM.ActiveCfg = Release|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.Release_UWP|ARM.Build.0 = Release|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.Release_UWP|iPhone.ActiveCfg = Release|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.Release_UWP|iPhone.Build.0 = Release|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.Release_UWP|iPhoneSimulator.ActiveCfg = Release|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.Release_UWP|iPhoneSimulator.Build.0 = Release|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.Release_UWP|x64.ActiveCfg = Release|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.Release_UWP|x64.Build.0 = Release|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.Release_UWP|x86.ActiveCfg = Release|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.Release_UWP|x86.Build.0 = Release|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.Release|Any CPU.Build.0 = Release|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.Release|ARM.ActiveCfg = Release|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.Release|ARM.Build.0 = Release|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.Release|iPhone.ActiveCfg = Release|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.Release|iPhone.Build.0 = Release|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.Release|x64.ActiveCfg = Release|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.Release|x64.Build.0 = Release|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.Release|x86.ActiveCfg = Release|Any CPU - {FB046231-9F21-4967-B0F7-88E1A200FC53}.Release|x86.Build.0 = Release|Any CPU {25DA869C-40CB-4C9A-A1E8-A685B7D4EA90}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU {25DA869C-40CB-4C9A-A1E8-A685B7D4EA90}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU {25DA869C-40CB-4C9A-A1E8-A685B7D4EA90}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU