Skip to content

Commit 948540e

Browse files
vnbaaijvnbaaij
authored
Sync net10 template structure to aspnetcore (#4242)
1 parent cbae1fb commit 948540e

File tree

90 files changed

+163
-163
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+163
-163
lines changed

‎src/Templates/templates/blazorweb-csharp-10/.template.config/template.json‎

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,23 @@
2424
"primaryOutputs": [
2525
{
2626
"condition": "(UseWebAssembly && (HostIdentifier == \"dotnetcli\" || HostIdentifier == \"dotnetcli-preview\"))",
27-
"path": "BlazorWeb-CSharp.sln"
27+
"path": "BlazorWebCSharp.1.sln"
2828
},
2929
{
3030
"condition": "(UseWebAssembly && HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")",
31-
"path": "BlazorWeb-CSharp/BlazorWeb-CSharp.csproj"
31+
"path": "BlazorWebCSharp.1/BlazorWebCSharp.1.csproj"
3232
},
3333
{
3434
"condition": "(!UseWebAssembly)",
35-
"path": "BlazorWeb-CSharp.csproj"
35+
"path": "BlazorWebCSharp.1.csproj"
3636
},
3737
{
3838
"condition": "(UseWebAssembly && HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")",
39-
"path": "BlazorWeb-CSharp.Client/BlazorWeb-CSharp.Client.csproj"
39+
"path": "BlazorWebCSharp.1.Client/BlazorWebCSharp.1.Client.csproj"
4040
}
4141
],
4242
"shortName": "fluentblazor",
43-
"sourceName": "BlazorWeb-CSharp",
43+
"sourceName": "BlazorWebCSharp.1",
4444
"sources": [
4545
{
4646
"source": "./",
@@ -55,42 +55,42 @@
5555
{
5656
"condition": "(!UseWebAssembly)",
5757
"exclude": [
58-
"BlazorWeb-CSharp.Client/**",
58+
"BlazorWebCSharp.1.Client/**",
5959
"*.sln"
6060
],
6161
"rename": {
62-
"BlazorWeb-CSharp/": "./"
62+
"BlazorWebCSharp.1/": "./"
6363
}
6464
},
6565
{
6666
"condition": "(UseWebAssembly && InteractiveAtRoot)",
6767
"rename": {
68-
"BlazorWeb-CSharp/Components/Layout/MainLayout.razor": "./BlazorWeb-CSharp.Client/Layout/MainLayout.razor",
69-
"BlazorWeb-CSharp/Components/Pages/Home.razor": "./BlazorWeb-CSharp.Client/Pages/Home.razor",
70-
"BlazorWeb-CSharp/Components/Pages/NotFound.razor": "./BlazorWeb-CSharp.Client/Pages/NotFound.razor",
71-
"BlazorWeb-CSharp/Components/Pages/Weather.razor": "./BlazorWeb-CSharp.Client/Pages/Weather.razor",
72-
"BlazorWeb-CSharp/Components/Routes.razor": "./BlazorWeb-CSharp.Client/Routes.razor"
68+
"BlazorWebCSharp.1/Components/Layout/MainLayout.razor": "./BlazorWebCSharp.1.Client/Layout/MainLayout.razor",
69+
"BlazorWebCSharp.1/Components/Pages/Home.razor": "./BlazorWebCSharp.1.Client/Pages/Home.razor",
70+
"BlazorWebCSharp.1/Components/Pages/NotFound.razor": "./BlazorWebCSharp.1.Client/Pages/NotFound.razor",
71+
"BlazorWebCSharp.1/Components/Pages/Weather.razor": "./BlazorWebCSharp.1.Client/Pages/Weather.razor",
72+
"BlazorWebCSharp.1/Components/Routes.razor": "./BlazorWebCSharp.1.Client/Routes.razor"
7373
}
7474
},
7575
{
7676
"condition": "(UseWebAssembly)",
7777
"exclude": [
78-
"BlazorWeb-CSharp/Components/Layout/NavMenu.razor",
79-
"BlazorWeb-CSharp/Components/Layout/NavMenu.razor.css"
78+
"BlazorWebCSharp.1/Components/Layout/NavMenu.razor",
79+
"BlazorWebCSharp.1/Components/Layout/NavMenu.razor.css"
8080
]
8181
},
8282
{
8383
"condition": "(!UseProgramMain)",
8484
"exclude": [
85-
"BlazorWeb-CSharp/Program.Main.cs",
86-
"BlazorWeb-CSharp.Client/Program.Main.cs"
85+
"BlazorWebCSharp.1/Program.Main.cs",
86+
"BlazorWebCSharp.1.Client/Program.Main.cs"
8787
]
8888
},
8989
{
9090
"condition": "(UseProgramMain)",
9191
"exclude": [
92-
"BlazorWeb-CSharp/Program.cs",
93-
"BlazorWeb-CSharp.Client/Program.cs"
92+
"BlazorWebCSharp.1/Program.cs",
93+
"BlazorWebCSharp.1.Client/Program.cs"
9494
],
9595
"rename": {
9696
"Program.Main.cs": "Program.cs"
@@ -99,37 +99,37 @@
9999
{
100100
"condition": "(!(UseServer && !UseWebAssembly))",
101101
"exclude": [
102-
"BlazorWeb-CSharp/Components/Pages/Counter.razor"
102+
"BlazorWebCSharp.1/Components/Pages/Counter.razor"
103103
]
104104
},
105105
{
106106
"condition": "(!UseServer)",
107107
"exclude": [
108-
"BlazorWeb-CSharp/Components/Layout/ReconnectModal.razor",
109-
"BlazorWeb-CSharp/Components/Layout/ReconnectModal.razor.css",
110-
"BlazorWeb-CSharp/Components/Layout/ReconnectModal.razor.js",
111-
"BlazorWeb-CSharp.Client/Layout/ReconnectModal.razor",
112-
"BlazorWeb-CSharp.Client/Layout/ReconnectModal.razor.css",
113-
"BlazorWeb-CSharp.Client/Layout/ReconnectModal.razor.js"
108+
"BlazorWebCSharp.1/Components/Layout/ReconnectModal.razor",
109+
"BlazorWebCSharp.1/Components/Layout/ReconnectModal.razor.css",
110+
"BlazorWebCSharp.1/Components/Layout/ReconnectModal.razor.js",
111+
"BlazorWebCSharp.1.Client/Layout/ReconnectModal.razor",
112+
"BlazorWebCSharp.1.Client/Layout/ReconnectModal.razor.css",
113+
"BlazorWebCSharp.1.Client/Layout/ReconnectModal.razor.js"
114114
]
115115
},
116116
{
117117
"condition": "(ExcludeLaunchSettings)",
118118
"exclude": [
119-
"BlazorWeb-CSharp/Properties/launchSettings.json"
119+
"BlazorWebCSharp.1/Properties/launchSettings.json"
120120
]
121121
},
122122
{
123123
"condition": "(!SampleContent)",
124124
"exclude": [
125-
"BlazorWeb-CSharp/Components/Pages/Auth.*",
126-
"BlazorWeb-CSharp/Components/Pages/Counter.*",
127-
"BlazorWeb-CSharp/Components/Pages/Weather.*",
128-
"BlazorWeb-CSharp/Components/Layout/NavMenu.*",
129-
"BlazorWeb-CSharp/wwwroot/favicon.*",
130-
"BlazorWeb-CSharp.Client/Layout/NavMenu.*",
131-
"BlazorWeb-CSharp.Client/Pages/**",
132-
"BlazorWeb-CSharp.Client/wwwroot/**"
125+
"BlazorWebCSharp.1/Components/Pages/Auth.*",
126+
"BlazorWebCSharp.1/Components/Pages/Counter.*",
127+
"BlazorWebCSharp.1/Components/Pages/Weather.*",
128+
"BlazorWebCSharp.1/Components/Layout/NavMenu.*",
129+
"BlazorWebCSharp.1/wwwroot/favicon.*",
130+
"BlazorWebCSharp.1.Client/Layout/NavMenu.*",
131+
"BlazorWebCSharp.1.Client/Pages/**",
132+
"BlazorWebCSharp.1.Client/wwwroot/**"
133133
]
134134
},
135135
{
@@ -141,70 +141,70 @@
141141
{
142142
"condition": "(!IndividualLocalAuth)",
143143
"exclude": [
144-
"BlazorWeb-CSharp/Components/Account/**",
145-
"BlazorWeb-CSharp/Data/**",
146-
"BlazorWeb-CSharp.Client/UserInfo.cs",
147-
"BlazorWeb-CSharp.Client/Pages/Auth.razor"
144+
"BlazorWebCSharp.1/Components/Account/**",
145+
"BlazorWebCSharp.1/Data/**",
146+
"BlazorWebCSharp.1.Client/UserInfo.cs",
147+
"BlazorWebCSharp.1.Client/Pages/Auth.razor"
148148
]
149149
},
150150
{
151151
"condition": "(!(IndividualLocalAuth && !UseLocalDB))",
152152
"exclude": [
153-
"BlazorWeb-CSharp/Data/app.db"
153+
"BlazorWebCSharp.1/Data/app.db"
154154
]
155155
},
156156
{
157157
"condition": "(!(IndividualLocalAuth && !UseWebAssembly))",
158158
"exclude": [
159-
"BlazorWeb-CSharp/Components/Pages/Auth.razor"
159+
"BlazorWebCSharp.1/Components/Pages/Auth.razor"
160160
]
161161
},
162162
{
163163
"condition": "(!(IndividualLocalAuth && UseServer))",
164164
"exclude": [
165-
"BlazorWeb-CSharp/Components/Account/IdentityRevalidatingAuthenticationStateProvider.cs"
165+
"BlazorWebCSharp.1/Components/Account/IdentityRevalidatingAuthenticationStateProvider.cs"
166166
]
167167
},
168168
{
169169
"condition": "(IndividualLocalAuth && UseLocalDB && UseWebAssembly)",
170170
"rename": {
171-
"BlazorWeb-CSharp/Data/SqlServer/": "BlazorWeb-CSharp/Data/Migrations/"
171+
"BlazorWebCSharp.1/Data/SqlServer/": "BlazorWebCSharp.1/Data/Migrations/"
172172
},
173173
"exclude": [
174-
"BlazorWeb-CSharp/Data/SqlLite/**"
174+
"BlazorWebCSharp.1/Data/SqlLite/**"
175175
]
176176
},
177177
{
178178
"condition": "(IndividualLocalAuth && UseLocalDB && !UseWebAssembly)",
179179
"rename": {
180-
"BlazorWeb-CSharp/Data/SqlServer/": "Data/Migrations/"
180+
"BlazorWebCSharp.1/Data/SqlServer/": "Data/Migrations/"
181181
},
182182
"exclude": [
183-
"BlazorWeb-CSharp/Data/SqlLite/**"
183+
"BlazorWebCSharp.1/Data/SqlLite/**"
184184
]
185185
},
186186
{
187187
"condition": "(IndividualLocalAuth && !UseLocalDB && UseWebAssembly)",
188188
"rename": {
189-
"BlazorWeb-CSharp/Data/SqlLite/": "BlazorWeb-CSharp/Data/Migrations/"
189+
"BlazorWebCSharp.1/Data/SqlLite/": "BlazorWebCSharp.1/Data/Migrations/"
190190
},
191191
"exclude": [
192-
"BlazorWeb-CSharp/Data/SqlServer/**"
192+
"BlazorWebCSharp.1/Data/SqlServer/**"
193193
]
194194
},
195195
{
196196
"condition": "(IndividualLocalAuth && !UseLocalDB && !UseWebAssembly)",
197197
"rename": {
198-
"BlazorWeb-CSharp/Data/SqlLite/": "Data/Migrations/"
198+
"BlazorWebCSharp.1/Data/SqlLite/": "Data/Migrations/"
199199
},
200200
"exclude": [
201-
"BlazorWeb-CSharp/Data/SqlServer/**"
201+
"BlazorWebCSharp.1/Data/SqlServer/**"
202202
]
203203
},
204204
{
205205
"condition": "(IndividualLocalAuth && UseWebAssembly)",
206206
"rename": {
207-
"BlazorWeb-CSharp/Components/Account/Shared/RedirectToLogin.razor": "BlazorWeb-CSharp.Client/RedirectToLogin.razor"
207+
"BlazorWebCSharp.1/Components/Account/Shared/RedirectToLogin.razor": "BlazorWebCSharp.1.Client/RedirectToLogin.razor"
208208
}
209209
}
210210
]
@@ -231,8 +231,8 @@
231231
"UserSecretsId": {
232232
"type": "parameter",
233233
"datatype": "string",
234-
"replaces": "aspnet-BlazorWeb-CSharp-53bc9b9d-9d6a-45d4-8429-2a2761773502",
235-
"defaultValue": "aspnet-BlazorWeb-CSharp-53bc9b9d-9d6a-45d4-8429-2a2761773502",
234+
"replaces": "aspnet-BlazorWebCSharp.1-53bc9b9d-9d6a-45d4-8429-2a2761773502",
235+
"defaultValue": "aspnet-BlazorWebCSharp.1-53bc9b9d-9d6a-45d4-8429-2a2761773502",
236236
"description": "The ID to use for secrets (use with Individual auth)."
237237
},
238238
"skipRestore": {

‎src/Templates/templates/blazorweb-csharp-10/BlazorWeb-CSharp/Components/Account/Pages/_Imports.razor‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎src/Templates/templates/blazorweb-csharp-10/BlazorWeb-CSharp.Client/BlazorWeb-CSharp.Client.csproj‎ renamed to ‎src/Templates/templates/blazorweb-csharp-10/BlazorWebCSharp.1.Client/BlazorWebCSharp.1.Client.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<Nullable>enable</Nullable>
77
<NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
88
<StaticWebAssetProjectMode>Default</StaticWebAssetProjectMode>
9-
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">BlazorWeb-CSharp.Client</RootNamespace>
9+
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">BlazorWebCSharp._1.Client</RootNamespace>
1010
<AssemblyName Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">$(AssemblyName.Replace(' ', '_'))</AssemblyName>
1111
<BlazorDisableThrowNavigationException>true</BlazorDisableThrowNavigationException>
1212
</PropertyGroup>

‎src/Templates/templates/blazorweb-csharp-10/BlazorWeb-CSharp.Client/Layout/NavMenu.razor‎ renamed to ‎src/Templates/templates/blazorweb-csharp-10/BlazorWebCSharp.1.Client/Layout/NavMenu.razor‎

File renamed without changes.

‎src/Templates/templates/blazorweb-csharp-10/BlazorWeb-CSharp.Client/Pages/Auth.razor‎ renamed to ‎src/Templates/templates/blazorweb-csharp-10/BlazorWebCSharp.1.Client/Pages/Auth.razor‎

File renamed without changes.

‎src/Templates/templates/blazorweb-csharp-10/BlazorWeb-CSharp.Client/Pages/Counter.razor‎ renamed to ‎src/Templates/templates/blazorweb-csharp-10/BlazorWebCSharp.1.Client/Pages/Counter.razor‎

File renamed without changes.

‎src/Templates/templates/blazorweb-csharp-10/BlazorWeb-CSharp.Client/Program.Main.cs‎ renamed to ‎src/Templates/templates/blazorweb-csharp-10/BlazorWebCSharp.1.Client/Program.Main.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
22

3-
namespace BlazorWeb_CSharp.Client;
3+
namespace BlazorWebCSharp._1.Client;
44

55
class Program
66
{

‎src/Templates/templates/blazorweb-csharp-10/BlazorWeb-CSharp.Client/Program.cs‎ renamed to ‎src/Templates/templates/blazorweb-csharp-10/BlazorWebCSharp.1.Client/Program.cs‎

File renamed without changes.

‎src/Templates/templates/blazorweb-csharp-10/BlazorWeb-CSharp.Client/_Imports.razor‎ renamed to ‎src/Templates/templates/blazorweb-csharp-10/BlazorWebCSharp.1.Client/_Imports.razor‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
@using Microsoft.FluentUI.AspNetCore.Components
1212
@using Icons = Microsoft.FluentUI.AspNetCore.Components.Icons
1313
@using Microsoft.JSInterop
14-
@using BlazorWeb_CSharp.Client
14+
@using BlazorWebCSharp._1.Client
1515
@*#if (UseWebAssembly && InteractiveAtRoot) -->
16-
@using BlazorWeb_CSharp.Client.Layout
16+
@using BlazorWebCSharp._1.Client.Layout
1717
##endif*@

‎src/Templates/templates/blazorweb-csharp-10/BlazorWeb-CSharp.Client/wwwroot/appsettings.Development.json‎ renamed to ‎src/Templates/templates/blazorweb-csharp-10/BlazorWebCSharp.1.Client/wwwroot/appsettings.Development.json‎

File renamed without changes.

0 commit comments

Comments
 (0)