diff --git a/global.json b/global.json index 04dc395bf..eecaee0d0 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,10 @@ { "sdk": { - "version": "7.0.100-preview.2.22153.17" + "version": "6.0.201" }, "tools": { - "dotnet": "7.0.100-preview.2.22153.17", + "dotnet": "6.0.201", + "version": "7.0.100-preview.2.22153.17" "runtimes": { "dotnet": [ "6.0.3" diff --git a/src/BlazorCustomElements/BlazorAppProvidingCustomElements.sln b/src/BlazorCustomElements/BlazorAppProvidingCustomElements.sln new file mode 100644 index 000000000..4158fc188 --- /dev/null +++ b/src/BlazorCustomElements/BlazorAppProvidingCustomElements.sln @@ -0,0 +1,31 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.1.32319.34 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorAppProvidingCustomElements", "samples\BlazorAppProvidingCustomElements\BlazorAppProvidingCustomElements.csproj", "{C126B804-C343-489B-B296-9C3F3BAF356F}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.CustomElements", "src\Microsoft.AspNetCore.Components.CustomElements\Microsoft.AspNetCore.Components.CustomElements.csproj", "{AFE5C698-C4EF-4A3D-9F98-8CAC3EC6B681}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {C126B804-C343-489B-B296-9C3F3BAF356F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C126B804-C343-489B-B296-9C3F3BAF356F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C126B804-C343-489B-B296-9C3F3BAF356F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C126B804-C343-489B-B296-9C3F3BAF356F}.Release|Any CPU.Build.0 = Release|Any CPU + {AFE5C698-C4EF-4A3D-9F98-8CAC3EC6B681}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AFE5C698-C4EF-4A3D-9F98-8CAC3EC6B681}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AFE5C698-C4EF-4A3D-9F98-8CAC3EC6B681}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AFE5C698-C4EF-4A3D-9F98-8CAC3EC6B681}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {98DEC5B3-3120-4A0A-BCE7-C07D9C04519F} + EndGlobalSection +EndGlobal diff --git a/src/BlazorCustomElements/samples/BlazorAppProvidingCustomElements/BlazorAppProvidingCustomElements.csproj b/src/BlazorCustomElements/samples/BlazorAppProvidingCustomElements/BlazorAppProvidingCustomElements.csproj index 2e86580b4..15762c3de 100644 --- a/src/BlazorCustomElements/samples/BlazorAppProvidingCustomElements/BlazorAppProvidingCustomElements.csproj +++ b/src/BlazorCustomElements/samples/BlazorAppProvidingCustomElements/BlazorAppProvidingCustomElements.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/src/BlazorCustomElements/samples/BlazorAppProvidingCustomElements/Program.cs b/src/BlazorCustomElements/samples/BlazorAppProvidingCustomElements/Program.cs index 85c4dc626..4526532e3 100644 --- a/src/BlazorCustomElements/samples/BlazorAppProvidingCustomElements/Program.cs +++ b/src/BlazorCustomElements/samples/BlazorAppProvidingCustomElements/Program.cs @@ -1,6 +1,9 @@ using Microsoft.AspNetCore.Components.Web; using Microsoft.AspNetCore.Components.WebAssembly.Hosting; using BlazorAppProvidingCustomElements; +using Microsoft.Extensions.DependencyInjection; +using System.Net.Http; +using System; var builder = WebAssemblyHostBuilder.CreateDefault(args); diff --git a/src/BlazorCustomElements/samples/BlazorAppProvidingCustomElements/Properties/PublishProfiles/FolderProfile.pubxml b/src/BlazorCustomElements/samples/BlazorAppProvidingCustomElements/Properties/PublishProfiles/FolderProfile.pubxml new file mode 100644 index 000000000..9886d495c --- /dev/null +++ b/src/BlazorCustomElements/samples/BlazorAppProvidingCustomElements/Properties/PublishProfiles/FolderProfile.pubxml @@ -0,0 +1,16 @@ + + + + + False + False + True + Release + Any CPU + FileSystem + C:\resources\AspLabs\artifacts\bin\BlazorAppProvidingCustomElements\Release\net6.0\browser-wasm\publish\ + FileSystem + + \ No newline at end of file diff --git a/src/BlazorCustomElements/samples/angular-app-with-blazor/src/proxy.conf.json b/src/BlazorCustomElements/samples/angular-app-with-blazor/src/proxy.conf.json index 7d7aa0e80..d562c346d 100644 --- a/src/BlazorCustomElements/samples/angular-app-with-blazor/src/proxy.conf.json +++ b/src/BlazorCustomElements/samples/angular-app-with-blazor/src/proxy.conf.json @@ -1,3 +1,7 @@ { - "/": { "target": "https://localhost:7108", "secure": false } + "/": { + "target": "https://localhost:7108", + "secure": false, + "logLevel": "debug" + } } diff --git a/src/BlazorCustomElements/src/Microsoft.AspNetCore.Components.CustomElements/Microsoft.AspNetCore.Components.CustomElements.csproj b/src/BlazorCustomElements/src/Microsoft.AspNetCore.Components.CustomElements/Microsoft.AspNetCore.Components.CustomElements.csproj index c078114ef..fec6bd78c 100644 --- a/src/BlazorCustomElements/src/Microsoft.AspNetCore.Components.CustomElements/Microsoft.AspNetCore.Components.CustomElements.csproj +++ b/src/BlazorCustomElements/src/Microsoft.AspNetCore.Components.CustomElements/Microsoft.AspNetCore.Components.CustomElements.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/BlazorCustomElements/src/Microsoft.AspNetCore.Components.CustomElements/package-lock.json b/src/BlazorCustomElements/src/Microsoft.AspNetCore.Components.CustomElements/package-lock.json new file mode 100644 index 000000000..28a8723d1 --- /dev/null +++ b/src/BlazorCustomElements/src/Microsoft.AspNetCore.Components.CustomElements/package-lock.json @@ -0,0 +1,6 @@ +{ + "name": "Microsoft.AspNetCore.Components.CustomElements", + "lockfileVersion": 2, + "requires": true, + "packages": {} +}