-
Notifications
You must be signed in to change notification settings - Fork 20
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
OSOE-91: ⭐ Normalize line endings to auto across all submodules
- Loading branch information
Showing
30 changed files
with
824 additions
and
823 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
* text=auto |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule Lombiq.HelpfulLibraries
updated
201 files
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
# This file is used to ensure the Localization folder is created during deployment | ||
# This file is used to ensure the Localization folder is created during deployment |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,50 +1,50 @@ | ||
<Project Sdk="Microsoft.NET.Sdk.Web"> | ||
|
||
<PropertyGroup> | ||
<TargetFramework>net6.0</TargetFramework> | ||
<TieredCompilation>true</TieredCompilation> | ||
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel> | ||
</PropertyGroup> | ||
|
||
<ItemGroup> | ||
<None Remove="Recipes\Media\meadow-orchard.jpg" /> | ||
</ItemGroup> | ||
|
||
<ItemGroup> | ||
<Content Include="Recipes\Media\meadow-orchard.jpg"> | ||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | ||
</Content> | ||
</ItemGroup> | ||
|
||
<ItemGroup> | ||
<Folder Include="wwwroot\" /> | ||
</ItemGroup> | ||
|
||
<ItemGroup> | ||
<ProjectReference Include="..\..\test\Lombiq.UITestingToolbox\Lombiq.Tests.UI.AppExtensions\Lombiq.Tests.UI.AppExtensions.csproj" /> | ||
<ProjectReference Include="..\..\test\Lombiq.UITestingToolbox\Lombiq.Tests.UI.Shortcuts\Lombiq.Tests.UI.Shortcuts.csproj" /> | ||
<ProjectReference Include="..\Libraries\Lombiq.HelpfulLibraries\Lombiq.HelpfulLibraries.Samples\Lombiq.HelpfulLibraries.Samples.csproj" /> | ||
<ProjectReference Include="..\Modules\Lombiq.AuditTrailExtensions\Lombiq.AuditTrailExtensions.csproj" /> | ||
<ProjectReference Include="..\Modules\Lombiq.ChartJs\Lombiq.ChartJs.csproj" /> | ||
<ProjectReference Include="..\Modules\Lombiq.DataTables\Lombiq.DataTables.Samples\Lombiq.DataTables.Samples.csproj" /> | ||
<ProjectReference Include="..\Modules\Lombiq.HelpfulExtensions\Lombiq.HelpfulExtensions.csproj" /> | ||
<ProjectReference Include="..\Modules\Lombiq.Hosting.Azure.ApplicationInsights\Lombiq.Hosting.Azure.ApplicationInsights.csproj" /> | ||
<ProjectReference Include="..\Modules\Lombiq.Hosting.Tenants\Lombiq.Hosting.Tenants.Admin.Login\Lombiq.Hosting.Tenants.Admin.Login.csproj" /> | ||
<ProjectReference Include="..\Modules\Lombiq.Hosting.Tenants\Lombiq.Hosting.Tenants.Management\Lombiq.Hosting.Tenants.Management.csproj" /> | ||
<ProjectReference Include="..\Modules\Lombiq.JsonEditor\Lombiq.JsonEditor.csproj" /> | ||
<ProjectReference Include="..\Modules\Lombiq.OSOCE.Samples\Lombiq.OSOCE.Samples.csproj" /> | ||
<ProjectReference Include="..\Modules\Lombiq.Privacy\Lombiq.Privacy.csproj" /> | ||
<ProjectReference Include="..\Modules\Lombiq.TrainingDemo\Lombiq.TrainingDemo.csproj" /> | ||
<ProjectReference Include="..\Modules\Lombiq.UIKit\Lombiq.UIKit.csproj" /> | ||
<ProjectReference Include="..\Modules\Lombiq.VueJs\Lombiq.VueJs.Samples\Lombiq.VueJs.Samples.csproj" /> | ||
<ProjectReference Include="..\Modules\Lombiq.VueJs\Lombiq.VueJs\Lombiq.VueJs.csproj" /> | ||
<ProjectReference Include="..\Utilities\Lombiq.SetupExtensions\Lombiq.SetupExtensions.csproj" /> | ||
</ItemGroup> | ||
|
||
<ItemGroup> | ||
<PackageReference Include="OrchardCore.Admin.Abstractions" Version="1.3.0" /> | ||
<PackageReference Include="OrchardCore.Logging.NLog" Version="1.3.0" /> | ||
<PackageReference Include="OrchardCore.Application.Cms.Targets" Version="1.3.0" /> | ||
</ItemGroup> | ||
|
||
</Project> | ||
<Project Sdk="Microsoft.NET.Sdk.Web"> | ||
|
||
<PropertyGroup> | ||
<TargetFramework>net6.0</TargetFramework> | ||
<TieredCompilation>true</TieredCompilation> | ||
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel> | ||
</PropertyGroup> | ||
|
||
<ItemGroup> | ||
<None Remove="Recipes\Media\meadow-orchard.jpg" /> | ||
</ItemGroup> | ||
|
||
<ItemGroup> | ||
<Content Include="Recipes\Media\meadow-orchard.jpg"> | ||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | ||
</Content> | ||
</ItemGroup> | ||
|
||
<ItemGroup> | ||
<Folder Include="wwwroot\" /> | ||
</ItemGroup> | ||
|
||
<ItemGroup> | ||
<ProjectReference Include="..\..\test\Lombiq.UITestingToolbox\Lombiq.Tests.UI.AppExtensions\Lombiq.Tests.UI.AppExtensions.csproj" /> | ||
<ProjectReference Include="..\..\test\Lombiq.UITestingToolbox\Lombiq.Tests.UI.Shortcuts\Lombiq.Tests.UI.Shortcuts.csproj" /> | ||
<ProjectReference Include="..\Libraries\Lombiq.HelpfulLibraries\Lombiq.HelpfulLibraries.Samples\Lombiq.HelpfulLibraries.Samples.csproj" /> | ||
<ProjectReference Include="..\Modules\Lombiq.AuditTrailExtensions\Lombiq.AuditTrailExtensions.csproj" /> | ||
<ProjectReference Include="..\Modules\Lombiq.ChartJs\Lombiq.ChartJs.csproj" /> | ||
<ProjectReference Include="..\Modules\Lombiq.DataTables\Lombiq.DataTables.Samples\Lombiq.DataTables.Samples.csproj" /> | ||
<ProjectReference Include="..\Modules\Lombiq.HelpfulExtensions\Lombiq.HelpfulExtensions.csproj" /> | ||
<ProjectReference Include="..\Modules\Lombiq.Hosting.Azure.ApplicationInsights\Lombiq.Hosting.Azure.ApplicationInsights.csproj" /> | ||
<ProjectReference Include="..\Modules\Lombiq.Hosting.Tenants\Lombiq.Hosting.Tenants.Admin.Login\Lombiq.Hosting.Tenants.Admin.Login.csproj" /> | ||
<ProjectReference Include="..\Modules\Lombiq.Hosting.Tenants\Lombiq.Hosting.Tenants.Management\Lombiq.Hosting.Tenants.Management.csproj" /> | ||
<ProjectReference Include="..\Modules\Lombiq.JsonEditor\Lombiq.JsonEditor.csproj" /> | ||
<ProjectReference Include="..\Modules\Lombiq.OSOCE.Samples\Lombiq.OSOCE.Samples.csproj" /> | ||
<ProjectReference Include="..\Modules\Lombiq.Privacy\Lombiq.Privacy.csproj" /> | ||
<ProjectReference Include="..\Modules\Lombiq.TrainingDemo\Lombiq.TrainingDemo.csproj" /> | ||
<ProjectReference Include="..\Modules\Lombiq.UIKit\Lombiq.UIKit.csproj" /> | ||
<ProjectReference Include="..\Modules\Lombiq.VueJs\Lombiq.VueJs.Samples\Lombiq.VueJs.Samples.csproj" /> | ||
<ProjectReference Include="..\Modules\Lombiq.VueJs\Lombiq.VueJs\Lombiq.VueJs.csproj" /> | ||
<ProjectReference Include="..\Utilities\Lombiq.SetupExtensions\Lombiq.SetupExtensions.csproj" /> | ||
</ItemGroup> | ||
|
||
<ItemGroup> | ||
<PackageReference Include="OrchardCore.Admin.Abstractions" Version="1.3.0" /> | ||
<PackageReference Include="OrchardCore.Logging.NLog" Version="1.3.0" /> | ||
<PackageReference Include="OrchardCore.Application.Cms.Targets" Version="1.3.0" /> | ||
</ItemGroup> | ||
|
||
</Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,26 +1,26 @@ | ||
<?xml version="1.0" encoding="utf-8" ?> | ||
<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd" | ||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
autoReload="true" | ||
internalLogLevel="Warn" | ||
internalLogFile="App_Data/logs/internal-nlog.txt"> | ||
|
||
<extensions> | ||
<add assembly="NLog.Web.AspNetCore" /> | ||
<add assembly="OrchardCore.Logging.NLog" /> | ||
</extensions> | ||
|
||
<!-- define various log targets --> | ||
<targets> | ||
<!-- write logs to file --> | ||
<target xsi:type="File" name="allfile" fileName="${var:configDir}/App_Data/logs/orchard-log-${shortdate}.log" | ||
layout="${longdate}|${orchard-tenant-name}|${aspnet-traceidentifier}|${event-properties:item=EventId.Id}|${logger}|${uppercase:${level}}|${message} ${exception:format=ToString,StackTrace}" /> | ||
|
||
<!--<target xsi:type="Null" name="blackhole" /> --> | ||
</targets> | ||
|
||
<rules> | ||
<!--All logs--> | ||
<logger name="*" minlevel="Error" writeTo="allfile" /> | ||
</rules> | ||
</nlog> | ||
<?xml version="1.0" encoding="utf-8" ?> | ||
<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd" | ||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
autoReload="true" | ||
internalLogLevel="Warn" | ||
internalLogFile="App_Data/logs/internal-nlog.txt"> | ||
|
||
<extensions> | ||
<add assembly="NLog.Web.AspNetCore" /> | ||
<add assembly="OrchardCore.Logging.NLog" /> | ||
</extensions> | ||
|
||
<!-- define various log targets --> | ||
<targets> | ||
<!-- write logs to file --> | ||
<target xsi:type="File" name="allfile" fileName="${var:configDir}/App_Data/logs/orchard-log-${shortdate}.log" | ||
layout="${longdate}|${orchard-tenant-name}|${aspnet-traceidentifier}|${event-properties:item=EventId.Id}|${logger}|${uppercase:${level}}|${message} ${exception:format=ToString,StackTrace}" /> | ||
|
||
<!--<target xsi:type="Null" name="blackhole" /> --> | ||
</targets> | ||
|
||
<rules> | ||
<!--All logs--> | ||
<logger name="*" minlevel="Error" writeTo="allfile" /> | ||
</rules> | ||
</nlog> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,20 +1,20 @@ | ||
using Microsoft.AspNetCore.Builder; | ||
using Microsoft.Extensions.DependencyInjection; | ||
using NLog.Web; | ||
|
||
var builder = WebApplication.CreateBuilder(args); | ||
|
||
builder.Host.UseNLog(); | ||
|
||
var configuration = builder.Configuration; | ||
|
||
// Here we're configuring the UI Testing Toolbox (https://github.com/Lombiq/UI-Testing-Toolbox) so UI tests can be | ||
// executed on the app. For a tutorial on how to create UI tests check out the project. ConfigureUITesting() won't do | ||
// anything when the app is not run for UI testing. | ||
builder.Services.AddOrchardCms(builder => builder.ConfigureUITesting(configuration, enableShortcutsDuringUITesting: true)); | ||
|
||
var app = builder.Build(); | ||
|
||
app.UseStaticFiles(); | ||
app.UseOrchardCore(); | ||
app.Run(); | ||
using Microsoft.AspNetCore.Builder; | ||
using Microsoft.Extensions.DependencyInjection; | ||
using NLog.Web; | ||
|
||
var builder = WebApplication.CreateBuilder(args); | ||
|
||
builder.Host.UseNLog(); | ||
|
||
var configuration = builder.Configuration; | ||
|
||
// Here we're configuring the UI Testing Toolbox (https://github.com/Lombiq/UI-Testing-Toolbox) so UI tests can be | ||
// executed on the app. For a tutorial on how to create UI tests check out the project. ConfigureUITesting() won't do | ||
// anything when the app is not run for UI testing. | ||
builder.Services.AddOrchardCms(builder => builder.ConfigureUITesting(configuration, enableShortcutsDuringUITesting: true)); | ||
|
||
var app = builder.Build(); | ||
|
||
app.UseStaticFiles(); | ||
app.UseOrchardCore(); | ||
app.Run(); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,27 +1,27 @@ | ||
{ | ||
"iisSettings": { | ||
"windowsAuthentication": false, | ||
"anonymousAuthentication": true, | ||
"iisExpress": { | ||
"applicationUrl": "http://localhost:61318/", | ||
"sslPort": 44335 | ||
} | ||
}, | ||
"profiles": { | ||
"IIS Express": { | ||
"commandName": "IISExpress", | ||
"launchBrowser": true, | ||
"environmentVariables": { | ||
"ASPNETCORE_ENVIRONMENT": "Development" | ||
} | ||
}, | ||
"Lombiq.OSOCE.Web": { | ||
"commandName": "Project", | ||
"launchBrowser": true, | ||
"environmentVariables": { | ||
"ASPNETCORE_ENVIRONMENT": "Development" | ||
}, | ||
"applicationUrl": "https://localhost:5001;http://localhost:5000" | ||
} | ||
} | ||
} | ||
{ | ||
"iisSettings": { | ||
"windowsAuthentication": false, | ||
"anonymousAuthentication": true, | ||
"iisExpress": { | ||
"applicationUrl": "http://localhost:61318/", | ||
"sslPort": 44335 | ||
} | ||
}, | ||
"profiles": { | ||
"IIS Express": { | ||
"commandName": "IISExpress", | ||
"launchBrowser": true, | ||
"environmentVariables": { | ||
"ASPNETCORE_ENVIRONMENT": "Development" | ||
} | ||
}, | ||
"Lombiq.OSOCE.Web": { | ||
"commandName": "Project", | ||
"launchBrowser": true, | ||
"environmentVariables": { | ||
"ASPNETCORE_ENVIRONMENT": "Development" | ||
}, | ||
"applicationUrl": "https://localhost:5001;http://localhost:5000" | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,30 +1,30 @@ | ||
{ | ||
"Logging": { | ||
"IncludeScopes": false, | ||
"LogLevel": { | ||
"Default": "Warning", | ||
"Microsoft.AspNetCore": "Warning" | ||
}, | ||
"ApplicationInsights": { | ||
"LogLevel": { | ||
"Default": "Warning" | ||
} | ||
} | ||
}, | ||
"OrchardCore": { | ||
"Lombiq_TrainingDemo": { | ||
"Message": "This comes from appsettings!" | ||
}, | ||
"Lombiq_Hosting_Azure_ApplicationInsights": { | ||
// Fill this out if you'd like to use the Application Insights module. | ||
"QuickPulseTelemetryModuleAuthenticationApiKey": "your API key here", | ||
// Some sample configuration below. | ||
"EnableUserNameCollection": true, | ||
"EnableLoggingTestMiddleware": true | ||
}, | ||
"ApplicationInsights": { | ||
// Fill this out if you'd like to use the Application Insights module. | ||
"InstrumentationKey": "your instrumentation key comes here" | ||
} | ||
} | ||
} | ||
{ | ||
"Logging": { | ||
"IncludeScopes": false, | ||
"LogLevel": { | ||
"Default": "Warning", | ||
"Microsoft.AspNetCore": "Warning" | ||
}, | ||
"ApplicationInsights": { | ||
"LogLevel": { | ||
"Default": "Warning" | ||
} | ||
} | ||
}, | ||
"OrchardCore": { | ||
"Lombiq_TrainingDemo": { | ||
"Message": "This comes from appsettings!" | ||
}, | ||
"Lombiq_Hosting_Azure_ApplicationInsights": { | ||
// Fill this out if you'd like to use the Application Insights module. | ||
"QuickPulseTelemetryModuleAuthenticationApiKey": "your API key here", | ||
// Some sample configuration below. | ||
"EnableUserNameCollection": true, | ||
"EnableLoggingTestMiddleware": true | ||
}, | ||
"ApplicationInsights": { | ||
// Fill this out if you'd like to use the Application Insights module. | ||
"InstrumentationKey": "your instrumentation key comes here" | ||
} | ||
} | ||
} |
Binary file not shown.
Submodule Lombiq.ChartJs
updated
8 files
Submodule Lombiq.DataTables
updated
2 files
+7 −11 | .gitignore | |
+0 −0 | Lombiq.DataTables/wwwroot/vendors/datatables.net-buttons/buttons.colVis.js |
Submodule Lombiq.HelpfulExtensions
updated
45 files
Submodule Lombiq.Hosting.Azure.ApplicationInsights
updated
22 files
+1 −1 | .gitattributes | |
+12 −12 | .github/workflows/publish.yml | |
+10 −3 | .gitignore | |
+73 −73 | ApplicationInsightsOptions.cs | |
+8 −8 | Constants/FeatureIds.cs | |
+20 −20 | Extensions/ServiceProviderExtensions.cs | |
+9 −9 | Extensions/SupportPropertiesExtensions.cs | |
+25 −25 | Helpers/LoggingTestHelper.cs | |
+14 −14 | License.md | |
+53 −53 | Lombiq.Hosting.Azure.ApplicationInsights.csproj | |
+10 −10 | Manifest.cs | |
+95 −95 | Readme.md | |
+50 −50 | Services/BackgroundTaskTelemetryEventHandler.cs | |
+15 −15 | Services/ITrackingScriptFactory.cs | |
+27 −27 | Services/LoggingTestBackgroundTask.cs | |
+39 −39 | Services/LoggingTestMiddleware.cs | |
+19 −19 | Services/NullTelemetryChannel.cs | |
+23 −23 | Services/TrackingScriptFactory.cs | |
+64 −64 | Services/TrackingScriptInjectingFilter.cs | |
+103 −103 | Startup.cs | |
+37 −37 | TelemetryInitializers/ShellNamePopulatingTelemetryInitializer.cs | |
+50 −50 | TelemetryInitializers/UserContextPopulatingTelemetryInitializer.cs |
Submodule Lombiq.JsonEditor
updated
4 files
+1 −0 | .gitattributes | |
+3 −0 | .gitignore | |
+0 −0 | wwwroot/.placeholder | |
+1 −1 | wwwroot/css/json-editor.css.map |
Submodule Lombiq.Privacy
updated
11 files
Submodule Lombiq.TrainingDemo
updated
117 files
Submodule Lombiq.UIKit
updated
7 files
+1 −1 | .gitattributes | |
+10 −7 | .gitignore | |
+0 −1 | wwwroot/.placeholder | |
+1 −1 | wwwroot/css/checkbox.css.map | |
+1 −1 | wwwroot/css/dropdown.css.map | |
+1 −1 | wwwroot/css/showcase.css.map | |
+1 −1 | wwwroot/css/textbox.css.map |
Submodule Lombiq.VueJs
updated
77 files
Submodule Lombiq.Gulp.Extensions
updated
7 files
+1 −0 | .gitattributes | |
+7 −3 | .gitignore | |
+9 −2 | Docs/JsTargets.md | |
+29 −1 | Tasks/scss-targets.js | |
+1,017 −31 | package-lock.json | |
+2 −1 | package.json | |
+8 −0 | pnpm-lock.yaml |
Oops, something went wrong.