Skip to content

Commit eb06f81

Browse files
kdinevkdinev
authored
Merge branch 'master' into dependabot/npm_and_yarn/npm_and_yarn-09fa3c0cf9
2 parents 3489d6f + 1789eda commit eb06f81

29 files changed

Lines changed: 68 additions & 49 deletions

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,3 +163,7 @@ src/*.*
163163
!src/Loader.ts
164164
!src/public_path.ts
165165
!src/refs-state.ts
166+
167+
168+
**/tmp/*
169+
.idea/*

‎templates/IgniteUI.Blazor.Templates/content/igb-blazor/.template.config/template.json‎

Lines changed: 34 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,20 @@
1010
"language": "C#",
1111
"type": "project"
1212
},
13-
"sourceName": "IgniteBlazorApp",
13+
"sourceName": "IgniteBlazorApp.1",
1414
"preferNameDirectory": true,
1515
"symbols": {
16+
"StyleBundleName": {
17+
"type": "generated",
18+
"generator": "regex",
19+
"replaces": "StyleBundleName",
20+
"parameters": {
21+
"source": "name",
22+
"steps": [
23+
{ "regex": " ", "replacement": "_" }
24+
]
25+
}
26+
},
1627
"Hosting": {
1728
"type": "parameter",
1829
"datatype": "choice",
@@ -127,54 +138,54 @@
127138
{
128139
"condition": "(HostingIsServer)",
129140
"exclude": [
130-
"IgniteBlazorApp.Client/**",
131-
"IgniteBlazorApp.sln"
141+
"IgniteBlazorApp.1.Client/**",
142+
"IgniteBlazorApp.1.sln"
132143
]
133144
},
134145
{
135146
"condition": "(HostingHasClient && !IsCli)",
136147
"exclude": [
137-
"IgniteBlazorApp.sln"
148+
"IgniteBlazorApp.1.sln"
138149
]
139150
},
140151
{
141152
"condition": "(HostingHasClient)",
142153
"rename": {
143-
"IgniteBlazorApp/Components/Routes.razor": "IgniteBlazorApp.Client/Routes.razor",
144-
"IgniteBlazorApp/Components/Layout/MainLayout.razor": "IgniteBlazorApp.Client/Layout/MainLayout.razor",
145-
"IgniteBlazorApp/Components/Layout/MainLayout.razor.css": "IgniteBlazorApp.Client/Layout/MainLayout.razor.css",
146-
"IgniteBlazorApp/Components/Layout/NavMenu.razor": "IgniteBlazorApp.Client/Layout/NavMenu.razor",
147-
"IgniteBlazorApp/Components/Pages/Home.razor": "IgniteBlazorApp.Client/Pages/Home.razor",
148-
"IgniteBlazorApp/Components/Pages/Counter.razor": "IgniteBlazorApp.Client/Pages/Counter.razor",
149-
"IgniteBlazorApp/Components/Pages/Weather.razor": "IgniteBlazorApp.Client/Pages/Weather.razor",
150-
"IgniteBlazorApp/Components/Pages/NotFound.razor": "IgniteBlazorApp.Client/Pages/NotFound.razor",
151-
"IgniteBlazorApp/Models/": "IgniteBlazorApp.Client/Models/",
152-
"IgniteBlazorApp/Services/": "IgniteBlazorApp.Client/Services/"
154+
"IgniteBlazorApp.1/Components/Routes.razor": "IgniteBlazorApp.1.Client/Routes.razor",
155+
"IgniteBlazorApp.1/Components/Layout/MainLayout.razor": "IgniteBlazorApp.1.Client/Layout/MainLayout.razor",
156+
"IgniteBlazorApp.1/Components/Layout/MainLayout.razor.css": "IgniteBlazorApp.1.Client/Layout/MainLayout.razor.css",
157+
"IgniteBlazorApp.1/Components/Layout/NavMenu.razor": "IgniteBlazorApp.1.Client/Layout/NavMenu.razor",
158+
"IgniteBlazorApp.1/Components/Pages/Home.razor": "IgniteBlazorApp.1.Client/Pages/Home.razor",
159+
"IgniteBlazorApp.1/Components/Pages/Counter.razor": "IgniteBlazorApp.1.Client/Pages/Counter.razor",
160+
"IgniteBlazorApp.1/Components/Pages/Weather.razor": "IgniteBlazorApp.1.Client/Pages/Weather.razor",
161+
"IgniteBlazorApp.1/Components/Pages/NotFound.razor": "IgniteBlazorApp.1.Client/Pages/NotFound.razor",
162+
"IgniteBlazorApp.1/Models/": "IgniteBlazorApp.1.Client/Models/",
163+
"IgniteBlazorApp.1/Services/": "IgniteBlazorApp.1.Client/Services/"
153164
}
154165
},
155166
{
156167
"condition": "(!HostingIsServer)",
157168
"exclude": [
158-
"IgniteBlazorApp/Components/Layout/ReconnectModal.razor",
159-
"IgniteBlazorApp/Components/Layout/ReconnectModal.razor.css",
160-
"IgniteBlazorApp/Components/Layout/ReconnectModal.razor.js"
169+
"IgniteBlazorApp.1/Components/Layout/ReconnectModal.razor",
170+
"IgniteBlazorApp.1/Components/Layout/ReconnectModal.razor.css",
171+
"IgniteBlazorApp.1/Components/Layout/ReconnectModal.razor.js"
161172
]
162173
},
163174
{
164175
"condition": "(!IncludeWeatherSample)",
165176
"exclude": [
166-
"IgniteBlazorApp/Components/Pages/Weather.razor",
167-
"IgniteBlazorApp/Models/WeatherForecast.cs",
168-
"IgniteBlazorApp/Services/WeatherForecastService.cs"
177+
"IgniteBlazorApp.1/Components/Pages/Weather.razor",
178+
"IgniteBlazorApp.1/Models/WeatherForecast.cs",
179+
"IgniteBlazorApp.1/Services/WeatherForecastService.cs"
169180
]
170181
}
171182
]
172183
}
173184
],
174185
"primaryOutputs": [
175-
{ "condition": "(HostingHasClient && IsCli)", "path": "IgniteBlazorApp.sln" },
176-
{ "condition": "(!HostingHasClient || !IsCli)", "path": "IgniteBlazorApp/IgniteBlazorApp.csproj" },
177-
{ "condition": "(HostingHasClient && !IsCli)", "path": "IgniteBlazorApp.Client/IgniteBlazorApp.Client.csproj" }
186+
{ "condition": "(HostingHasClient && IsCli)", "path": "IgniteBlazorApp.1.sln" },
187+
{ "condition": "(!HostingHasClient || !IsCli)", "path": "IgniteBlazorApp.1/IgniteBlazorApp.1.csproj" },
188+
{ "condition": "(HostingHasClient && !IsCli)", "path": "IgniteBlazorApp.1.Client/IgniteBlazorApp.1.Client.csproj" }
178189
],
179190
"postActions": [
180191
{

templates/IgniteUI.Blazor.Templates/content/igb-blazor/IgniteBlazorApp.Client/IgniteBlazorApp.Client.csproj renamed to templates/IgniteUI.Blazor.Templates/content/igb-blazor/IgniteBlazorApp.1.Client/IgniteBlazorApp.1.Client.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
<ImplicitUsings>enable</ImplicitUsings>
77
<NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
88
<StaticWebAssetProjectMode>Default</StaticWebAssetProjectMode>
9+
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">IgniteBlazorApp._1.Client</RootNamespace>
10+
<AssemblyName Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">$(AssemblyName.Replace(' ', '_'))</AssemblyName>
911
<BlazorDisableThrowNavigationException>true</BlazorDisableThrowNavigationException>
1012
</PropertyGroup>
1113

templates/IgniteUI.Blazor.Templates/content/igb-blazor/IgniteBlazorApp.Client/Program.cs renamed to templates/IgniteUI.Blazor.Templates/content/igb-blazor/IgniteBlazorApp.1.Client/Program.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#if (IncludeWeatherSample)
22
using ApexCharts;
33
#endif
4-
using IgniteBlazorApp.Client;
4+
using IgniteBlazorApp._1.Client;
55
#if (IncludeWeatherSample)
6-
using IgniteBlazorAppIGB_NS_SEGMENT.Services;
6+
using IgniteBlazorApp._1IGB_NS_SEGMENT.Services;
77
#endif
88
using IgniteUI.Blazor.Controls;
99
using Microsoft.AspNetCore.Components.WebAssembly.Hosting;

templates/IgniteUI.Blazor.Templates/content/igb-blazor/IgniteBlazorApp.Client/_Imports.razor renamed to templates/IgniteUI.Blazor.Templates/content/igb-blazor/IgniteBlazorApp.1.Client/_Imports.razor

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
@using Microsoft.AspNetCore.Components.Web.Virtualization
88
@using Microsoft.AspNetCore.Components.WebAssembly.Http
99
@using Microsoft.JSInterop
10-
@using IgniteBlazorApp.Client
11-
@using IgniteBlazorApp.Client.Layout
12-
@using IgniteBlazorApp.Client.Pages
10+
@using IgniteBlazorApp._1.Client
11+
@using IgniteBlazorApp._1.Client.Layout
12+
@using IgniteBlazorApp._1.Client.Pages
1313
@using IgniteUI.Blazor.Controls
1414
@*#if (IncludeWeatherSample) *@
15-
@using IgniteBlazorAppIGB_NS_SEGMENT.Models
16-
@using IgniteBlazorAppIGB_NS_SEGMENT.Services
15+
@using IgniteBlazorApp._1IGB_NS_SEGMENT.Models
16+
@using IgniteBlazorApp._1IGB_NS_SEGMENT.Services
1717
@using ApexCharts
1818
@*#endif *@

templates/IgniteUI.Blazor.Templates/content/igb-blazor/IgniteBlazorApp.sln renamed to templates/IgniteUI.Blazor.Templates/content/igb-blazor/IgniteBlazorApp.1.sln

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
22
# Visual Studio Version 17
33
VisualStudioVersion = 17.0.0.0
44
MinimumVisualStudioVersion = 10.0.40219.1
5-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IgniteBlazorApp", "IgniteBlazorApp\IgniteBlazorApp.csproj", "{5B79E1E7-F8D1-42EC-AD23-24CD70BFEC20}"
5+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IgniteBlazorApp.1", "IgniteBlazorApp.1\IgniteBlazorApp.1.csproj", "{5B79E1E7-F8D1-42EC-AD23-24CD70BFEC20}"
66
EndProject
7-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IgniteBlazorApp.Client", "IgniteBlazorApp.Client\IgniteBlazorApp.Client.csproj", "{CD774515-3CAD-4C27-A3C2-C9CFEB887A29}"
7+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IgniteBlazorApp.1.Client", "IgniteBlazorApp.1.Client\IgniteBlazorApp.1.Client.csproj", "{CD774515-3CAD-4C27-A3C2-C9CFEB887A29}"
88
EndProject
99
Global
1010
GlobalSection(SolutionConfigurationPlatforms) = preSolution

templates/IgniteUI.Blazor.Templates/content/igb-blazor/IgniteBlazorApp/Components/App.razor renamed to templates/IgniteUI.Blazor.Templates/content/igb-blazor/IgniteBlazorApp.1/Components/App.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<base href="/" />
88
<ResourcePreloader />
99
<link rel="stylesheet" href="@Assets["app.css"]" />
10-
<link rel="stylesheet" href="@Assets["IgniteBlazorApp.styles.css"]" />
10+
<link rel="stylesheet" href="@Assets["StyleBundleName.styles.css"]" />
1111
<link rel="stylesheet" href="@Assets["_content/IgniteUI.Blazor/themes/IGB_VARIANT/IGB_THEME.css"]" />
1212
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons" />
1313
<ImportMap />

templates/IgniteUI.Blazor.Templates/content/igb-blazor/IgniteBlazorApp/Components/Layout/MainLayout.razor renamed to templates/IgniteUI.Blazor.Templates/content/igb-blazor/IgniteBlazorApp.1/Components/Layout/MainLayout.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
menu
88
</span>
99
</IgbIconButton>
10-
<h3 style="margin-left: 0.75rem;">IgniteBlazorApp</h3>
10+
<h3 style="margin-left: 0.75rem;">IgniteBlazorApp.1</h3>
1111
</IgbNavbar>
1212

1313
<div class="layout-body">

templates/IgniteUI.Blazor.Templates/content/igb-blazor/IgniteBlazorApp/Components/Layout/MainLayout.razor.css renamed to templates/IgniteUI.Blazor.Templates/content/igb-blazor/IgniteBlazorApp.1/Components/Layout/MainLayout.razor.css

File renamed without changes.

templates/IgniteUI.Blazor.Templates/content/igb-blazor/IgniteBlazorApp/Components/Layout/NavMenu.razor renamed to templates/IgniteUI.Blazor.Templates/content/igb-blazor/IgniteBlazorApp.1/Components/Layout/NavMenu.razor

File renamed without changes.

0 commit comments

Comments
 (0)