diff --git a/Remotion/Development/Web/ResourceHosting/ResourceVirtualPathProvider.cs b/Remotion/Development/Web/ResourceHosting/ResourceVirtualPathProvider.cs
index 602c3b9b7e..a955683f86 100644
--- a/Remotion/Development/Web/ResourceHosting/ResourceVirtualPathProvider.cs
+++ b/Remotion/Development/Web/ResourceHosting/ResourceVirtualPathProvider.cs
@@ -101,7 +101,8 @@ public bool IsMappedPath (string virtualPath)
if (!checkPath.StartsWith(_resourceRoot, StringComparison.OrdinalIgnoreCase))
return false;
- return GetResourcePathMapping(checkPath) != null;
+ var result = GetResourcePathMapping(checkPath) != null;
+ return result;
}
public override bool FileExists (string virtualPath)
@@ -201,7 +202,7 @@ private ResourceVirtualFile GetResourceVirtualFile (string virtualPath)
if (mapping != null)
{
var resourceRootPath = CombineVirtualPath(_resourceRoot, mapping.VirtualPath);
- var directoryRelativePath = MakeRelativeVirtualPath(resourceRootPath, appRelativeVirtualPath).Replace('/', '\\');
+ var directoryRelativePath = MakeRelativeVirtualPath(resourceRootPath, appRelativeVirtualPath).Replace('/', Path.DirectorySeparatorChar);
var directory = Path.GetFullPath(Path.Combine(GetProjectRoot(), mapping.RelativeFileSystemPath));
var filePath = Path.Combine(directory, directoryRelativePath);
@@ -232,7 +233,7 @@ private ResourceVirtualDirectory GetResourceVirtualDirectory (string virtualDir)
{
displayName = mapping.VirtualPath.TrimEnd('/');
var resourceRootPath = CombineVirtualPath(_resourceRoot, mapping.VirtualPath);
- var directoryRelativePath = MakeRelativeVirtualPath(resourceRootPath, appRelativeVirtualPath).Replace('/', '\\');
+ var directoryRelativePath = MakeRelativeVirtualPath(resourceRootPath, appRelativeVirtualPath).Replace('/', Path.DirectorySeparatorChar);
var mappedRootDirectory = Path.GetFullPath(Path.Combine(GetProjectRoot(), mapping.RelativeFileSystemPath));
var absolutePath = Path.Combine(mappedRootDirectory, directoryRelativePath);
diff --git a/Remotion/ObjectBinding/Web.Compatibility.UnitTests/ObjectBinding.Web.Compatibility.UnitTests.csproj b/Remotion/ObjectBinding/Web.Compatibility.UnitTests/ObjectBinding.Web.Compatibility.UnitTests.csproj
index e0f7ef945b..2059f6ab4c 100644
--- a/Remotion/ObjectBinding/Web.Compatibility.UnitTests/ObjectBinding.Web.Compatibility.UnitTests.csproj
+++ b/Remotion/ObjectBinding/Web.Compatibility.UnitTests/ObjectBinding.Web.Compatibility.UnitTests.csproj
@@ -20,5 +20,8 @@
+
+
+
\ No newline at end of file
diff --git a/Remotion/ObjectBinding/Web.Development.WebTesting.IntegrationTests/App.config b/Remotion/ObjectBinding/Web.Development.WebTesting.IntegrationTests/App.config
index c7fcf48436..8e78f2173d 100644
--- a/Remotion/ObjectBinding/Web.Development.WebTesting.IntegrationTests/App.config
+++ b/Remotion/ObjectBinding/Web.Development.WebTesting.IntegrationTests/App.config
@@ -23,20 +23,20 @@
asyncJavaScriptTimeout="00:00:10"
headless="true"
webApplicationRoot="http://localhost:60402/"
- screenshotDirectory=".\WebTestingOutput"
- logsDirectory=".\WebTestingOutput"
+ screenshotDirectory="./WebTestingOutput"
+ logsDirectory="./WebTestingOutput"
closeBrowserWindowsOnSetUpAndTearDown="false"
cleanUpUnmatchedDownloadedFiles="false"
requestErrorDetectionStrategy="AspNet">
-
+
-
-
-
-
-
-
+
+
+
+
+
+
@@ -50,7 +50,7 @@
-
+
diff --git a/Remotion/ObjectBinding/Web.Development.WebTesting.TestSite.Shared/ControlTestForm.aspx.cs b/Remotion/ObjectBinding/Web.Development.WebTesting.TestSite.Shared/ControlTestForm.aspx.cs
index 452f337266..5f45a7f89e 100644
--- a/Remotion/ObjectBinding/Web.Development.WebTesting.TestSite.Shared/ControlTestForm.aspx.cs
+++ b/Remotion/ObjectBinding/Web.Development.WebTesting.TestSite.Shared/ControlTestForm.aspx.cs
@@ -57,7 +57,7 @@ protected override void OnLoad (EventArgs e)
private void LoadUserControl ()
{
- var control = LoadControl(CurrentFunction.UserControl);
+ var control = LoadControl(CurrentFunction.UserControl);
_dataEditControl = (IDataEditControl)control;
_dataEditControl.ID = "DataEditControl";
diff --git a/Remotion/ObjectBinding/Web.Development.WebTesting.TestSite/App.config b/Remotion/ObjectBinding/Web.Development.WebTesting.TestSite/App.config
index bd8e50dbd2..84361d3580 100644
--- a/Remotion/ObjectBinding/Web.Development.WebTesting.TestSite/App.config
+++ b/Remotion/ObjectBinding/Web.Development.WebTesting.TestSite/App.config
@@ -5,39 +5,43 @@
http://go.microsoft.com/fwlink/?LinkId=169433
-->
-
-
-
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Remotion/ObjectBinding/Web.Development.WebTesting.TestSite/Properties/launchSettings.json b/Remotion/ObjectBinding/Web.Development.WebTesting.TestSite/Properties/launchSettings.json
index 49eb7a4c7d..f060508519 100644
--- a/Remotion/ObjectBinding/Web.Development.WebTesting.TestSite/Properties/launchSettings.json
+++ b/Remotion/ObjectBinding/Web.Development.WebTesting.TestSite/Properties/launchSettings.json
@@ -19,11 +19,12 @@
"ObjectBinding.Web.Development.WebTesting.TestSite": {
"commandName": "Project",
"dotnetRunMessages": "true",
- "launchBrowser": true,
+ "launchBrowser": false,
"launchUrl": "index.html",
"applicationUrl": "https://localhost:50543;http://localhost:50500",
"environmentVariables": {
- "ASPNETCORE_ENVIRONMENT": "Development"
+ "ASPNETCORE_ENVIRONMENT": "Development",
+ "DOTNET_ROOT": "/usr/share/dotnet"
}
}
}
diff --git a/Remotion/ObjectBinding/Web.Development.WebTesting.TestSite/Global.asax b/Remotion/ObjectBinding/Web.Development.WebTesting.TestSite/global.asax
similarity index 100%
rename from Remotion/ObjectBinding/Web.Development.WebTesting.TestSite/Global.asax
rename to Remotion/ObjectBinding/Web.Development.WebTesting.TestSite/global.asax
diff --git a/Remotion/ObjectBinding/Web.Development.WebTesting.TestSite/Global.asax.cs b/Remotion/ObjectBinding/Web.Development.WebTesting.TestSite/global.asax.cs
similarity index 91%
rename from Remotion/ObjectBinding/Web.Development.WebTesting.TestSite/Global.asax.cs
rename to Remotion/ObjectBinding/Web.Development.WebTesting.TestSite/global.asax.cs
index cf032bc044..532b7fdba3 100644
--- a/Remotion/ObjectBinding/Web.Development.WebTesting.TestSite/Global.asax.cs
+++ b/Remotion/ObjectBinding/Web.Development.WebTesting.TestSite/global.asax.cs
@@ -106,14 +106,14 @@ private static void RegisterResourceVirtualPathProvider ()
s_resourceVirtualPathProvider = new ResourceVirtualPathProvider(
new[]
{
- new ResourcePathMapping("Remotion.ObjectBinding.Sample/Image", @$"..\..\ObjectBinding\Sample\res\Image"),
- new ResourcePathMapping("Remotion.ObjectBinding.Web/Html", @$"..\..\ObjectBinding\Web.ClientScript\bin\{configuration}\dist"),
- new ResourcePathMapping("Remotion.ObjectBinding.Web/Themes", @"..\..\ObjectBinding\Web\res\Themes"),
- new ResourcePathMapping("Remotion.ObjectBinding.Web.Development.WebTesting.TestSite.Shared", @"..\..\ObjectBinding\Web.Development.WebTesting.TestSite.Shared"),
- new ResourcePathMapping("Remotion.Web/Html", @$"..\..\Web\ClientScript\bin\{configuration}\dist"),
- new ResourcePathMapping("Remotion.Web/Image", @"..\..\Web\Core\res\Image"),
- new ResourcePathMapping("Remotion.Web/Themes", @"..\..\Web\Core\res\Themes"),
- new ResourcePathMapping("Remotion.Web/UI", @"..\..\Web\Core\res\UI"),
+ new ResourcePathMapping("Remotion.ObjectBinding.Sample/Image", @$"../../ObjectBinding/Sample/res/Image"),
+ new ResourcePathMapping("Remotion.ObjectBinding.Web/Html", @$"../../ObjectBinding/Web.ClientScript/bin/{configuration}/dist"),
+ new ResourcePathMapping("Remotion.ObjectBinding.Web/Themes", @"../../ObjectBinding/Web/Res/Themes"),
+ new ResourcePathMapping("Remotion.ObjectBinding.Web.Development.WebTesting.TestSite.Shared", @"../../ObjectBinding/Web.Development.WebTesting.TestSite.Shared"),
+ new ResourcePathMapping("Remotion.Web/Html", @$"../../Web/ClientScript/bin/{configuration}/dist"),
+ new ResourcePathMapping("Remotion.Web/Image", @"../../Web/Core/Res/Image"),
+ new ResourcePathMapping("Remotion.Web/Themes", @"../../Web/Core/Res/Themes"),
+ new ResourcePathMapping("Remotion.Web/UI", @"../../Web/Core/Res/UI"),
},
FileExtensionHandlerMapping.Default);
s_resourceVirtualPathProvider.Register();
diff --git a/Remotion/ObjectBinding/Web.Development.WebTesting.TestSite/objects/Remotion.ObjectBinding.Sample.Job/2D15EFA6-AC6C-4b35-8678-8AE55E0D8ECC b/Remotion/ObjectBinding/Web.Development.WebTesting.TestSite/objects/Remotion.ObjectBinding.Sample.Job/2d15efa6-ac6c-4b35-8678-8ae55e0d8ecc
similarity index 100%
rename from Remotion/ObjectBinding/Web.Development.WebTesting.TestSite/objects/Remotion.ObjectBinding.Sample.Job/2D15EFA6-AC6C-4b35-8678-8AE55E0D8ECC
rename to Remotion/ObjectBinding/Web.Development.WebTesting.TestSite/objects/Remotion.ObjectBinding.Sample.Job/2d15efa6-ac6c-4b35-8678-8ae55e0d8ecc
diff --git a/Remotion/ObjectBinding/Web.Development.WebTesting.TestSite/objects/Remotion.ObjectBinding.Sample.Job/774E8412-FA31-46c6-B9F5-703DCB91CE24 b/Remotion/ObjectBinding/Web.Development.WebTesting.TestSite/objects/Remotion.ObjectBinding.Sample.Job/774e8412-fa31-46c6-b9f5-703dcb91ce24
similarity index 100%
rename from Remotion/ObjectBinding/Web.Development.WebTesting.TestSite/objects/Remotion.ObjectBinding.Sample.Job/774E8412-FA31-46c6-B9F5-703DCB91CE24
rename to Remotion/ObjectBinding/Web.Development.WebTesting.TestSite/objects/Remotion.ObjectBinding.Sample.Job/774e8412-fa31-46c6-b9f5-703dcb91ce24
diff --git a/Remotion/ObjectBinding/Web.Development.WebTesting.TestSite/objects/Remotion.ObjectBinding.Sample.Job/EFBF1D71-D05A-46c4-8E30-0287307042C3 b/Remotion/ObjectBinding/Web.Development.WebTesting.TestSite/objects/Remotion.ObjectBinding.Sample.Job/efbf1d71-d05a-46c4-8e30-0287307042c3
similarity index 100%
rename from Remotion/ObjectBinding/Web.Development.WebTesting.TestSite/objects/Remotion.ObjectBinding.Sample.Job/EFBF1D71-D05A-46c4-8E30-0287307042C3
rename to Remotion/ObjectBinding/Web.Development.WebTesting.TestSite/objects/Remotion.ObjectBinding.Sample.Job/efbf1d71-d05a-46c4-8e30-0287307042c3
diff --git a/Remotion/ObjectBinding/Web.Development.WebTesting.TestSite/objects/Remotion.ObjectBinding.Sample.Person/00000000-0000-0000-0000-00000000000A b/Remotion/ObjectBinding/Web.Development.WebTesting.TestSite/objects/Remotion.ObjectBinding.Sample.Person/00000000-0000-0000-0000-00000000000a
similarity index 100%
rename from Remotion/ObjectBinding/Web.Development.WebTesting.TestSite/objects/Remotion.ObjectBinding.Sample.Person/00000000-0000-0000-0000-00000000000A
rename to Remotion/ObjectBinding/Web.Development.WebTesting.TestSite/objects/Remotion.ObjectBinding.Sample.Person/00000000-0000-0000-0000-00000000000a
diff --git a/Remotion/ObjectBinding/Web.Development.WebTesting.TestSite/objects/Remotion.ObjectBinding.Sample.Person/00000000-0000-0000-0000-00000000000F b/Remotion/ObjectBinding/Web.Development.WebTesting.TestSite/objects/Remotion.ObjectBinding.Sample.Person/00000000-0000-0000-0000-00000000000f
similarity index 100%
rename from Remotion/ObjectBinding/Web.Development.WebTesting.TestSite/objects/Remotion.ObjectBinding.Sample.Person/00000000-0000-0000-0000-00000000000F
rename to Remotion/ObjectBinding/Web.Development.WebTesting.TestSite/objects/Remotion.ObjectBinding.Sample.Person/00000000-0000-0000-0000-00000000000f
diff --git a/Remotion/ObjectBinding/Web.IntegrationTests/App.config b/Remotion/ObjectBinding/Web.IntegrationTests/App.config
index c545d9008b..bb8aad31f1 100644
--- a/Remotion/ObjectBinding/Web.IntegrationTests/App.config
+++ b/Remotion/ObjectBinding/Web.IntegrationTests/App.config
@@ -20,20 +20,20 @@
asyncJavaScriptTimeout="00:00:10"
headless="true"
webApplicationRoot="http://localhost:60402/"
- screenshotDirectory=".\WebTestingOutput"
- logsDirectory=".\WebTestingOutput"
+ screenshotDirectory="./WebTestingOutput"
+ logsDirectory="./WebTestingOutput"
closeBrowserWindowsOnSetUpAndTearDown="false"
cleanUpUnmatchedDownloadedFiles="false"
requestErrorDetectionStrategy="AspNet">
-
+
-
-
-
-
-
-
+
+
+
+
+
+
@@ -45,7 +45,7 @@
-
+
diff --git a/Remotion/ObjectBinding/Web/Res/Themes/NovaGray/Html/BocCheckBox.css b/Remotion/ObjectBinding/Web/Res/Themes/NovaGray/Html/BocCheckbox.css
similarity index 100%
rename from Remotion/ObjectBinding/Web/Res/Themes/NovaGray/Html/BocCheckBox.css
rename to Remotion/ObjectBinding/Web/Res/Themes/NovaGray/Html/BocCheckbox.css
diff --git a/Remotion/ObjectBinding/Web/Res/Themes/NovaViso/HTML/BocAutoCompleteReferenceValue.UI.css b/Remotion/ObjectBinding/Web/Res/Themes/NovaViso/Html/BocAutoCompleteReferenceValue.UI.css
similarity index 100%
rename from Remotion/ObjectBinding/Web/Res/Themes/NovaViso/HTML/BocAutoCompleteReferenceValue.UI.css
rename to Remotion/ObjectBinding/Web/Res/Themes/NovaViso/Html/BocAutoCompleteReferenceValue.UI.css
diff --git a/Remotion/ObjectBinding/Web/Res/Themes/NovaViso/HTML/BocAutoCompleteReferenceValue.css b/Remotion/ObjectBinding/Web/Res/Themes/NovaViso/Html/BocAutoCompleteReferenceValue.css
similarity index 100%
rename from Remotion/ObjectBinding/Web/Res/Themes/NovaViso/HTML/BocAutoCompleteReferenceValue.css
rename to Remotion/ObjectBinding/Web/Res/Themes/NovaViso/Html/BocAutoCompleteReferenceValue.css
diff --git a/Remotion/ObjectBinding/Web/Res/Themes/NovaViso/HTML/BocBooleanValue.css b/Remotion/ObjectBinding/Web/Res/Themes/NovaViso/Html/BocBooleanValue.css
similarity index 100%
rename from Remotion/ObjectBinding/Web/Res/Themes/NovaViso/HTML/BocBooleanValue.css
rename to Remotion/ObjectBinding/Web/Res/Themes/NovaViso/Html/BocBooleanValue.css
diff --git a/Remotion/ObjectBinding/Web/Res/Themes/NovaViso/HTML/BocCheckBox.css b/Remotion/ObjectBinding/Web/Res/Themes/NovaViso/Html/BocCheckbox.css
similarity index 100%
rename from Remotion/ObjectBinding/Web/Res/Themes/NovaViso/HTML/BocCheckBox.css
rename to Remotion/ObjectBinding/Web/Res/Themes/NovaViso/Html/BocCheckbox.css
diff --git a/Remotion/ObjectBinding/Web/Res/Themes/NovaViso/HTML/BocDateTimeValue.css b/Remotion/ObjectBinding/Web/Res/Themes/NovaViso/Html/BocDateTimeValue.css
similarity index 100%
rename from Remotion/ObjectBinding/Web/Res/Themes/NovaViso/HTML/BocDateTimeValue.css
rename to Remotion/ObjectBinding/Web/Res/Themes/NovaViso/Html/BocDateTimeValue.css
diff --git a/Remotion/ObjectBinding/Web/Res/Themes/NovaViso/HTML/BocEnumValue.css b/Remotion/ObjectBinding/Web/Res/Themes/NovaViso/Html/BocEnumValue.css
similarity index 100%
rename from Remotion/ObjectBinding/Web/Res/Themes/NovaViso/HTML/BocEnumValue.css
rename to Remotion/ObjectBinding/Web/Res/Themes/NovaViso/Html/BocEnumValue.css
diff --git a/Remotion/ObjectBinding/Web/Res/Themes/NovaViso/HTML/BocList.css b/Remotion/ObjectBinding/Web/Res/Themes/NovaViso/Html/BocList.css
similarity index 100%
rename from Remotion/ObjectBinding/Web/Res/Themes/NovaViso/HTML/BocList.css
rename to Remotion/ObjectBinding/Web/Res/Themes/NovaViso/Html/BocList.css
diff --git a/Remotion/ObjectBinding/Web/Res/Themes/NovaViso/HTML/BocMultilineTextValue.css b/Remotion/ObjectBinding/Web/Res/Themes/NovaViso/Html/BocMultilineTextValue.css
similarity index 100%
rename from Remotion/ObjectBinding/Web/Res/Themes/NovaViso/HTML/BocMultilineTextValue.css
rename to Remotion/ObjectBinding/Web/Res/Themes/NovaViso/Html/BocMultilineTextValue.css
diff --git a/Remotion/ObjectBinding/Web/Res/Themes/NovaViso/HTML/BocReferenceValue.css b/Remotion/ObjectBinding/Web/Res/Themes/NovaViso/Html/BocReferenceValue.css
similarity index 100%
rename from Remotion/ObjectBinding/Web/Res/Themes/NovaViso/HTML/BocReferenceValue.css
rename to Remotion/ObjectBinding/Web/Res/Themes/NovaViso/Html/BocReferenceValue.css
diff --git a/Remotion/ObjectBinding/Web/Res/Themes/NovaViso/HTML/BocTextValue.css b/Remotion/ObjectBinding/Web/Res/Themes/NovaViso/Html/BocTextValue.css
similarity index 100%
rename from Remotion/ObjectBinding/Web/Res/Themes/NovaViso/HTML/BocTextValue.css
rename to Remotion/ObjectBinding/Web/Res/Themes/NovaViso/Html/BocTextValue.css
diff --git a/Remotion/Web/Core/Res/Themes/NovaGray/HTML/Common.css b/Remotion/Web/Core/Res/Themes/NovaGray/Html/Common.css
similarity index 100%
rename from Remotion/Web/Core/Res/Themes/NovaGray/HTML/Common.css
rename to Remotion/Web/Core/Res/Themes/NovaGray/Html/Common.css
diff --git a/Remotion/Web/Core/Res/Themes/NovaGray/HTML/DatePicker.css b/Remotion/Web/Core/Res/Themes/NovaGray/Html/DatePicker.css
similarity index 100%
rename from Remotion/Web/Core/Res/Themes/NovaGray/HTML/DatePicker.css
rename to Remotion/Web/Core/Res/Themes/NovaGray/Html/DatePicker.css
diff --git a/Remotion/Web/Core/Res/Themes/NovaGray/HTML/DropDownMenu.css b/Remotion/Web/Core/Res/Themes/NovaGray/Html/DropDownMenu.css
similarity index 100%
rename from Remotion/Web/Core/Res/Themes/NovaGray/HTML/DropDownMenu.css
rename to Remotion/Web/Core/Res/Themes/NovaGray/Html/DropDownMenu.css
diff --git a/Remotion/Web/Core/Res/Themes/NovaGray/HTML/ExecutionEngine.css b/Remotion/Web/Core/Res/Themes/NovaGray/Html/ExecutionEngine.css
similarity index 100%
rename from Remotion/Web/Core/Res/Themes/NovaGray/HTML/ExecutionEngine.css
rename to Remotion/Web/Core/Res/Themes/NovaGray/Html/ExecutionEngine.css
diff --git a/Remotion/Web/Core/Res/Themes/NovaGray/HTML/FormGrid.css b/Remotion/Web/Core/Res/Themes/NovaGray/Html/FormGrid.css
similarity index 100%
rename from Remotion/Web/Core/Res/Themes/NovaGray/HTML/FormGrid.css
rename to Remotion/Web/Core/Res/Themes/NovaGray/Html/FormGrid.css
diff --git a/Remotion/Web/Core/Res/Themes/NovaGray/HTML/ListMenu.css b/Remotion/Web/Core/Res/Themes/NovaGray/Html/ListMenu.css
similarity index 100%
rename from Remotion/Web/Core/Res/Themes/NovaGray/HTML/ListMenu.css
rename to Remotion/Web/Core/Res/Themes/NovaGray/Html/ListMenu.css
diff --git a/Remotion/Web/Core/Res/Themes/NovaGray/HTML/Roboto-Bold.ttf b/Remotion/Web/Core/Res/Themes/NovaGray/Html/Roboto-Bold.ttf
similarity index 100%
rename from Remotion/Web/Core/Res/Themes/NovaGray/HTML/Roboto-Bold.ttf
rename to Remotion/Web/Core/Res/Themes/NovaGray/Html/Roboto-Bold.ttf
diff --git a/Remotion/Web/Core/Res/Themes/NovaGray/HTML/Roboto-Medium.ttf b/Remotion/Web/Core/Res/Themes/NovaGray/Html/Roboto-Medium.ttf
similarity index 100%
rename from Remotion/Web/Core/Res/Themes/NovaGray/HTML/Roboto-Medium.ttf
rename to Remotion/Web/Core/Res/Themes/NovaGray/Html/Roboto-Medium.ttf
diff --git a/Remotion/Web/Core/Res/Themes/NovaGray/HTML/Roboto-Regular.ttf b/Remotion/Web/Core/Res/Themes/NovaGray/Html/Roboto-Regular.ttf
similarity index 100%
rename from Remotion/Web/Core/Res/Themes/NovaGray/HTML/Roboto-Regular.ttf
rename to Remotion/Web/Core/Res/Themes/NovaGray/Html/Roboto-Regular.ttf
diff --git a/Remotion/Web/Core/Res/Themes/NovaGray/HTML/SingleView.css b/Remotion/Web/Core/Res/Themes/NovaGray/Html/SingleView.css
similarity index 100%
rename from Remotion/Web/Core/Res/Themes/NovaGray/HTML/SingleView.css
rename to Remotion/Web/Core/Res/Themes/NovaGray/Html/SingleView.css
diff --git a/Remotion/Web/Core/Res/Themes/NovaGray/HTML/SmartPage.css b/Remotion/Web/Core/Res/Themes/NovaGray/Html/SmartPage.css
similarity index 100%
rename from Remotion/Web/Core/Res/Themes/NovaGray/HTML/SmartPage.css
rename to Remotion/Web/Core/Res/Themes/NovaGray/Html/SmartPage.css
diff --git a/Remotion/Web/Core/Res/Themes/NovaGray/HTML/Style.css b/Remotion/Web/Core/Res/Themes/NovaGray/Html/Style.css
similarity index 100%
rename from Remotion/Web/Core/Res/Themes/NovaGray/HTML/Style.css
rename to Remotion/Web/Core/Res/Themes/NovaGray/Html/Style.css
diff --git a/Remotion/Web/Core/Res/Themes/NovaGray/HTML/StyleUtility.js b/Remotion/Web/Core/Res/Themes/NovaGray/Html/StyleUtility.js
similarity index 100%
rename from Remotion/Web/Core/Res/Themes/NovaGray/HTML/StyleUtility.js
rename to Remotion/Web/Core/Res/Themes/NovaGray/Html/StyleUtility.js
diff --git a/Remotion/Web/Core/Res/Themes/NovaGray/HTML/TabStrip.css b/Remotion/Web/Core/Res/Themes/NovaGray/Html/TabStrip.css
similarity index 100%
rename from Remotion/Web/Core/Res/Themes/NovaGray/HTML/TabStrip.css
rename to Remotion/Web/Core/Res/Themes/NovaGray/Html/TabStrip.css
diff --git a/Remotion/Web/Core/Res/Themes/NovaGray/HTML/TabbedMenu.css b/Remotion/Web/Core/Res/Themes/NovaGray/Html/TabbedMenu.css
similarity index 100%
rename from Remotion/Web/Core/Res/Themes/NovaGray/HTML/TabbedMenu.css
rename to Remotion/Web/Core/Res/Themes/NovaGray/Html/TabbedMenu.css
diff --git a/Remotion/Web/Core/Res/Themes/NovaGray/HTML/TabbedMultiView.css b/Remotion/Web/Core/Res/Themes/NovaGray/Html/TabbedMultiView.css
similarity index 100%
rename from Remotion/Web/Core/Res/Themes/NovaGray/HTML/TabbedMultiView.css
rename to Remotion/Web/Core/Res/Themes/NovaGray/Html/TabbedMultiView.css
diff --git a/Remotion/Web/Core/Res/Themes/NovaGray/HTML/TreeView.css b/Remotion/Web/Core/Res/Themes/NovaGray/Html/TreeView.css
similarity index 100%
rename from Remotion/Web/Core/Res/Themes/NovaGray/HTML/TreeView.css
rename to Remotion/Web/Core/Res/Themes/NovaGray/Html/TreeView.css
diff --git a/Remotion/Web/Core/Res/Themes/NovaGray/HTML/WebButton.css b/Remotion/Web/Core/Res/Themes/NovaGray/Html/WebButton.css
similarity index 100%
rename from Remotion/Web/Core/Res/Themes/NovaGray/HTML/WebButton.css
rename to Remotion/Web/Core/Res/Themes/NovaGray/Html/WebButton.css
diff --git a/Remotion/Web/Core/Res/Themes/NovaViso/HTML/Common.css b/Remotion/Web/Core/Res/Themes/NovaViso/Html/Common.css
similarity index 100%
rename from Remotion/Web/Core/Res/Themes/NovaViso/HTML/Common.css
rename to Remotion/Web/Core/Res/Themes/NovaViso/Html/Common.css
diff --git a/Remotion/Web/Core/Res/Themes/NovaViso/HTML/DatePicker.css b/Remotion/Web/Core/Res/Themes/NovaViso/Html/DatePicker.css
similarity index 100%
rename from Remotion/Web/Core/Res/Themes/NovaViso/HTML/DatePicker.css
rename to Remotion/Web/Core/Res/Themes/NovaViso/Html/DatePicker.css
diff --git a/Remotion/Web/Core/Res/Themes/NovaViso/HTML/DropDownMenu.css b/Remotion/Web/Core/Res/Themes/NovaViso/Html/DropDownMenu.css
similarity index 100%
rename from Remotion/Web/Core/Res/Themes/NovaViso/HTML/DropDownMenu.css
rename to Remotion/Web/Core/Res/Themes/NovaViso/Html/DropDownMenu.css
diff --git a/Remotion/Web/Core/Res/Themes/NovaViso/HTML/ExecutionEngine.css b/Remotion/Web/Core/Res/Themes/NovaViso/Html/ExecutionEngine.css
similarity index 100%
rename from Remotion/Web/Core/Res/Themes/NovaViso/HTML/ExecutionEngine.css
rename to Remotion/Web/Core/Res/Themes/NovaViso/Html/ExecutionEngine.css
diff --git a/Remotion/Web/Core/Res/Themes/NovaViso/HTML/FormGrid.css b/Remotion/Web/Core/Res/Themes/NovaViso/Html/FormGrid.css
similarity index 100%
rename from Remotion/Web/Core/Res/Themes/NovaViso/HTML/FormGrid.css
rename to Remotion/Web/Core/Res/Themes/NovaViso/Html/FormGrid.css
diff --git a/Remotion/Web/Core/Res/Themes/NovaViso/HTML/ListMenu.css b/Remotion/Web/Core/Res/Themes/NovaViso/Html/ListMenu.css
similarity index 100%
rename from Remotion/Web/Core/Res/Themes/NovaViso/HTML/ListMenu.css
rename to Remotion/Web/Core/Res/Themes/NovaViso/Html/ListMenu.css
diff --git a/Remotion/Web/Core/Res/Themes/NovaViso/HTML/Roboto-Bold.ttf b/Remotion/Web/Core/Res/Themes/NovaViso/Html/Roboto-Bold.ttf
similarity index 100%
rename from Remotion/Web/Core/Res/Themes/NovaViso/HTML/Roboto-Bold.ttf
rename to Remotion/Web/Core/Res/Themes/NovaViso/Html/Roboto-Bold.ttf
diff --git a/Remotion/Web/Core/Res/Themes/NovaViso/HTML/Roboto-License.txt b/Remotion/Web/Core/Res/Themes/NovaViso/Html/Roboto-License.txt
similarity index 100%
rename from Remotion/Web/Core/Res/Themes/NovaViso/HTML/Roboto-License.txt
rename to Remotion/Web/Core/Res/Themes/NovaViso/Html/Roboto-License.txt
diff --git a/Remotion/Web/Core/Res/Themes/NovaViso/HTML/Roboto-Medium.ttf b/Remotion/Web/Core/Res/Themes/NovaViso/Html/Roboto-Medium.ttf
similarity index 100%
rename from Remotion/Web/Core/Res/Themes/NovaViso/HTML/Roboto-Medium.ttf
rename to Remotion/Web/Core/Res/Themes/NovaViso/Html/Roboto-Medium.ttf
diff --git a/Remotion/Web/Core/Res/Themes/NovaViso/HTML/Roboto-Regular.ttf b/Remotion/Web/Core/Res/Themes/NovaViso/Html/Roboto-Regular.ttf
similarity index 100%
rename from Remotion/Web/Core/Res/Themes/NovaViso/HTML/Roboto-Regular.ttf
rename to Remotion/Web/Core/Res/Themes/NovaViso/Html/Roboto-Regular.ttf
diff --git a/Remotion/Web/Core/Res/Themes/NovaViso/HTML/SingleView.css b/Remotion/Web/Core/Res/Themes/NovaViso/Html/SingleView.css
similarity index 100%
rename from Remotion/Web/Core/Res/Themes/NovaViso/HTML/SingleView.css
rename to Remotion/Web/Core/Res/Themes/NovaViso/Html/SingleView.css
diff --git a/Remotion/Web/Core/Res/Themes/NovaViso/HTML/SmartPage.css b/Remotion/Web/Core/Res/Themes/NovaViso/Html/SmartPage.css
similarity index 100%
rename from Remotion/Web/Core/Res/Themes/NovaViso/HTML/SmartPage.css
rename to Remotion/Web/Core/Res/Themes/NovaViso/Html/SmartPage.css
diff --git a/Remotion/Web/Core/Res/Themes/NovaViso/HTML/Style.css b/Remotion/Web/Core/Res/Themes/NovaViso/Html/Style.css
similarity index 100%
rename from Remotion/Web/Core/Res/Themes/NovaViso/HTML/Style.css
rename to Remotion/Web/Core/Res/Themes/NovaViso/Html/Style.css
diff --git a/Remotion/Web/Core/Res/Themes/NovaViso/HTML/StyleUtility.js b/Remotion/Web/Core/Res/Themes/NovaViso/Html/StyleUtility.js
similarity index 100%
rename from Remotion/Web/Core/Res/Themes/NovaViso/HTML/StyleUtility.js
rename to Remotion/Web/Core/Res/Themes/NovaViso/Html/StyleUtility.js
diff --git a/Remotion/Web/Core/Res/Themes/NovaViso/HTML/TabStrip.css b/Remotion/Web/Core/Res/Themes/NovaViso/Html/TabStrip.css
similarity index 100%
rename from Remotion/Web/Core/Res/Themes/NovaViso/HTML/TabStrip.css
rename to Remotion/Web/Core/Res/Themes/NovaViso/Html/TabStrip.css
diff --git a/Remotion/Web/Core/Res/Themes/NovaViso/HTML/TabbedMenu.css b/Remotion/Web/Core/Res/Themes/NovaViso/Html/TabbedMenu.css
similarity index 100%
rename from Remotion/Web/Core/Res/Themes/NovaViso/HTML/TabbedMenu.css
rename to Remotion/Web/Core/Res/Themes/NovaViso/Html/TabbedMenu.css
diff --git a/Remotion/Web/Core/Res/Themes/NovaViso/HTML/TabbedMultiView.css b/Remotion/Web/Core/Res/Themes/NovaViso/Html/TabbedMultiView.css
similarity index 100%
rename from Remotion/Web/Core/Res/Themes/NovaViso/HTML/TabbedMultiView.css
rename to Remotion/Web/Core/Res/Themes/NovaViso/Html/TabbedMultiView.css
diff --git a/Remotion/Web/Core/Res/Themes/NovaViso/HTML/TreeView.css b/Remotion/Web/Core/Res/Themes/NovaViso/Html/TreeView.css
similarity index 100%
rename from Remotion/Web/Core/Res/Themes/NovaViso/HTML/TreeView.css
rename to Remotion/Web/Core/Res/Themes/NovaViso/Html/TreeView.css
diff --git a/Remotion/Web/Core/Res/Themes/NovaViso/HTML/WebButton.css b/Remotion/Web/Core/Res/Themes/NovaViso/Html/WebButton.css
similarity index 100%
rename from Remotion/Web/Core/Res/Themes/NovaViso/HTML/WebButton.css
rename to Remotion/Web/Core/Res/Themes/NovaViso/Html/WebButton.css
diff --git a/Remotion/Web/Core/Web.Core.csproj b/Remotion/Web/Core/Web.Core.csproj
index 8a7e642c0d..416abd15a9 100644
--- a/Remotion/Web/Core/Web.Core.csproj
+++ b/Remotion/Web/Core/Web.Core.csproj
@@ -37,6 +37,7 @@
+
diff --git a/Remotion/Web/Development.WebTesting.IntegrationTests/App.config b/Remotion/Web/Development.WebTesting.IntegrationTests/App.config
index ed1ffcd8a0..cc367baaaa 100644
--- a/Remotion/Web/Development.WebTesting.IntegrationTests/App.config
+++ b/Remotion/Web/Development.WebTesting.IntegrationTests/App.config
@@ -23,17 +23,17 @@
asyncJavaScriptTimeout="00:00:10"
headless="true"
webApplicationRoot="http://localhost:60401/"
- screenshotDirectory=".\WebTestingOutput"
- logsDirectory=".\WebTestingOutput"
+ screenshotDirectory="./WebTestingOutput"
+ logsDirectory="./WebTestingOutput"
closeBrowserWindowsOnSetUpAndTearDown="false"
cleanUpUnmatchedDownloadedFiles="false"
requestErrorDetectionStrategy="Remotion.Web.Development.WebTesting.IntegrationTests.DiagnosticInformationCollectingRequestErrorDetectionStrategy, Remotion.Web.Development.WebTesting.IntegrationTests">
-
+
-
-
-
+
+
+
@@ -47,7 +47,7 @@
-
+
diff --git a/Remotion/Web/Development.WebTesting.TestSite/Global.asax b/Remotion/Web/Development.WebTesting.TestSite/Global.asax
deleted file mode 100644
index 5136e8a207..0000000000
--- a/Remotion/Web/Development.WebTesting.TestSite/Global.asax
+++ /dev/null
@@ -1 +0,0 @@
-<%@ Application Codebehind="Global.asax.cs" Inherits="Remotion.Web.Development.WebTesting.TestSite.Global" Language="C#" %>
\ No newline at end of file
diff --git a/Remotion/Web/Development.WebTesting.TestSite/global.asax b/Remotion/Web/Development.WebTesting.TestSite/global.asax
new file mode 100644
index 0000000000..4b0968f70c
--- /dev/null
+++ b/Remotion/Web/Development.WebTesting.TestSite/global.asax
@@ -0,0 +1 @@
+<%@ Application Codebehind="global.asax.cs" Inherits="Remotion.Web.Development.WebTesting.TestSite.Global" Language="C#" %>
\ No newline at end of file
diff --git a/Remotion/Web/Development.WebTesting.TestSite/Global.asax.cs b/Remotion/Web/Development.WebTesting.TestSite/global.asax.cs
similarity index 92%
rename from Remotion/Web/Development.WebTesting.TestSite/Global.asax.cs
rename to Remotion/Web/Development.WebTesting.TestSite/global.asax.cs
index be009a8bf5..873d3ca061 100644
--- a/Remotion/Web/Development.WebTesting.TestSite/Global.asax.cs
+++ b/Remotion/Web/Development.WebTesting.TestSite/global.asax.cs
@@ -58,11 +58,11 @@ private static void RegisterResourceVirtualPathProvider ()
_resourceVirtualPathProvider = new ResourceVirtualPathProvider(
new[]
{
- new ResourcePathMapping("Remotion.Web/Html", @$"..\..\Web\ClientScript\bin\{configuration}\dist"),
- new ResourcePathMapping("Remotion.Web/Image", @"..\..\Web\Core\res\Image"),
- new ResourcePathMapping("Remotion.Web/Themes", @"..\..\Web\Core\res\Themes"),
- new ResourcePathMapping("Remotion.Web/UI", @"..\..\Web\Core\res\UI"),
- new ResourcePathMapping("Remotion.Web.Development.WebTesting.TestSite.Shared", @"..\..\Web\Development.WebTesting.TestSite.Shared")
+ new ResourcePathMapping("Remotion.Web/Html", @$"../../Web/ClientScript/bin/{configuration}/dist"),
+ new ResourcePathMapping("Remotion.Web/Image", @"../../Web/Core/Res/Image"),
+ new ResourcePathMapping("Remotion.Web/Themes", @"../../Web/Core/Res/Themes"),
+ new ResourcePathMapping("Remotion.Web/UI", @"../../Web/Core/Res/UI"),
+ new ResourcePathMapping("Remotion.Web.Development.WebTesting.TestSite.Shared", @"../../Web/Development.WebTesting.TestSite.Shared")
},
fileExtensionHandlerMapping.ToArray());
_resourceVirtualPathProvider.Register();
diff --git a/Remotion/Web/Development.WebTesting/Utilities/ProcessUtils.cs b/Remotion/Web/Development.WebTesting/Utilities/ProcessUtils.cs
index d51d9454e5..45c83b65a6 100644
--- a/Remotion/Web/Development.WebTesting/Utilities/ProcessUtils.cs
+++ b/Remotion/Web/Development.WebTesting/Utilities/ProcessUtils.cs
@@ -72,6 +72,8 @@ private static extern int NtQueryInformationProcess (
public static int GetParentProcessID ([NotNull] Process target)
{
ArgumentNullException.ThrowIfNull(target);
+ if (!OperatingSystem.IsWindows())
+ return -1;
// Query the process information
var info = new ParentInfo();
diff --git a/Remotion/Web/Development.WebTesting/Web.Development.WebTesting.csproj b/Remotion/Web/Development.WebTesting/Web.Development.WebTesting.csproj
index 6e5da1950a..8b9f3d4ff5 100644
--- a/Remotion/Web/Development.WebTesting/Web.Development.WebTesting.csproj
+++ b/Remotion/Web/Development.WebTesting/Web.Development.WebTesting.csproj
@@ -33,6 +33,7 @@
+
diff --git a/Remotion/Web/IntegrationTests/App.config b/Remotion/Web/IntegrationTests/App.config
index 7e3adeb844..551e03becf 100644
--- a/Remotion/Web/IntegrationTests/App.config
+++ b/Remotion/Web/IntegrationTests/App.config
@@ -22,17 +22,17 @@
asyncJavaScriptTimeout="00:00:10"
headless="true"
webApplicationRoot="http://localhost:60401/"
- screenshotDirectory=".\WebTestingOutput"
- logsDirectory=".\WebTestingOutput"
+ screenshotDirectory="./WebTestingOutput"
+ logsDirectory="./WebTestingOutput"
closeBrowserWindowsOnSetUpAndTearDown="false"
cleanUpUnmatchedDownloadedFiles="false"
requestErrorDetectionStrategy="Remotion.Web.Development.WebTesting.IntegrationTests.DiagnosticInformationCollectingRequestErrorDetectionStrategy, Remotion.Web.Development.WebTesting.IntegrationTests">
-
+
-
-
-
+
+
+
@@ -44,7 +44,7 @@
-
+