diff --git a/src/Adapters/Tests/WebForms/DotVVM.Adapters.WebForms.Tests.csproj b/src/Adapters/Tests/WebForms/DotVVM.Adapters.WebForms.Tests.csproj index 08d3a2e33f..b89d7dd149 100644 --- a/src/Adapters/Tests/WebForms/DotVVM.Adapters.WebForms.Tests.csproj +++ b/src/Adapters/Tests/WebForms/DotVVM.Adapters.WebForms.Tests.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/Api/Swashbuckle.AspNetCore.Tests/DotVVM.Framework.Api.Swashbuckle.AspNetCore.Tests.csproj b/src/Api/Swashbuckle.AspNetCore.Tests/DotVVM.Framework.Api.Swashbuckle.AspNetCore.Tests.csproj index c1057cb57f..f8f23db9d5 100644 --- a/src/Api/Swashbuckle.AspNetCore.Tests/DotVVM.Framework.Api.Swashbuckle.AspNetCore.Tests.csproj +++ b/src/Api/Swashbuckle.AspNetCore.Tests/DotVVM.Framework.Api.Swashbuckle.AspNetCore.Tests.csproj @@ -1,14 +1,14 @@  - net5.0 + net6.0 false - - + + diff --git a/src/DotVVM.Crossplatform.slnf b/src/DotVVM.Crossplatform.slnf index ceda0c5f98..0648d2d91f 100644 --- a/src/DotVVM.Crossplatform.slnf +++ b/src/DotVVM.Crossplatform.slnf @@ -38,8 +38,7 @@ "Tracing\\ApplicationInsights.AspNetCore\\DotVVM.Tracing.ApplicationInsights.AspNetCore.csproj", "Tracing\\ApplicationInsights\\DotVVM.Tracing.ApplicationInsights.csproj", "Tracing\\MiniProfiler.AspNetCore\\DotVVM.Tracing.MiniProfiler.AspNetCore.csproj", - "Tracing\\MiniProfiler.Shared\\DotVVM.Tracing.MiniProfiler.Shared.shproj", - "Tracing\\MiniProfiler.Tests\\DotVVM.Tracing.MiniProfiler.Tests.csproj" + "Tracing\\MiniProfiler.Shared\\DotVVM.Tracing.MiniProfiler.Shared.shproj" ] } } diff --git a/src/DotVVM.sln b/src/DotVVM.sln index 0c677c9d39..1b49797aa8 100644 --- a/src/DotVVM.sln +++ b/src/DotVVM.sln @@ -85,8 +85,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotVVM.Tracing.MiniProfiler EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "DotVVM.Tracing.MiniProfiler.Shared", "Tracing\MiniProfiler.Shared\DotVVM.Tracing.MiniProfiler.Shared.shproj", "{407D8620-72C2-454C-945D-840130D80D0B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotVVM.Tracing.MiniProfiler.Tests", "Tracing\MiniProfiler.Tests\DotVVM.Tracing.MiniProfiler.Tests.csproj", "{5C30A2AD-1921-4E71-A449-BDC75F4017B5}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotVVM.Tracing.ApplicationInsights.Owin", "Tracing\ApplicationInsights.Owin\DotVVM.Tracing.ApplicationInsights.Owin.csproj", "{9FD298FC-CB6D-4C61-B266-742B66F15A85}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotVVM.Samples.ApplicationInsights.AspNetCore", "Samples\ApplicationInsights.AspNetCore\DotVVM.Samples.ApplicationInsights.AspNetCore.csproj", "{C988A081-663F-4F4B-9302-50735C07FD18}" @@ -527,18 +525,6 @@ Global {35F3D396-E702-4ACB-BE7E-301E52561559}.Release|x64.Build.0 = Release|Any CPU {35F3D396-E702-4ACB-BE7E-301E52561559}.Release|x86.ActiveCfg = Release|Any CPU {35F3D396-E702-4ACB-BE7E-301E52561559}.Release|x86.Build.0 = Release|Any CPU - {5C30A2AD-1921-4E71-A449-BDC75F4017B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5C30A2AD-1921-4E71-A449-BDC75F4017B5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5C30A2AD-1921-4E71-A449-BDC75F4017B5}.Debug|x64.ActiveCfg = Debug|Any CPU - {5C30A2AD-1921-4E71-A449-BDC75F4017B5}.Debug|x64.Build.0 = Debug|Any CPU - {5C30A2AD-1921-4E71-A449-BDC75F4017B5}.Debug|x86.ActiveCfg = Debug|Any CPU - {5C30A2AD-1921-4E71-A449-BDC75F4017B5}.Debug|x86.Build.0 = Debug|Any CPU - {5C30A2AD-1921-4E71-A449-BDC75F4017B5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5C30A2AD-1921-4E71-A449-BDC75F4017B5}.Release|Any CPU.Build.0 = Release|Any CPU - {5C30A2AD-1921-4E71-A449-BDC75F4017B5}.Release|x64.ActiveCfg = Release|Any CPU - {5C30A2AD-1921-4E71-A449-BDC75F4017B5}.Release|x64.Build.0 = Release|Any CPU - {5C30A2AD-1921-4E71-A449-BDC75F4017B5}.Release|x86.ActiveCfg = Release|Any CPU - {5C30A2AD-1921-4E71-A449-BDC75F4017B5}.Release|x86.Build.0 = Release|Any CPU {9FD298FC-CB6D-4C61-B266-742B66F15A85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9FD298FC-CB6D-4C61-B266-742B66F15A85}.Debug|Any CPU.Build.0 = Debug|Any CPU {9FD298FC-CB6D-4C61-B266-742B66F15A85}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -770,7 +756,6 @@ Global {C474EF4C-8D49-4983-8D20-5BEFF46F2A19} = {C68603A3-5E43-46CF-AE6C-1463BDDF7948} {35F3D396-E702-4ACB-BE7E-301E52561559} = {C68603A3-5E43-46CF-AE6C-1463BDDF7948} {407D8620-72C2-454C-945D-840130D80D0B} = {C68603A3-5E43-46CF-AE6C-1463BDDF7948} - {5C30A2AD-1921-4E71-A449-BDC75F4017B5} = {C68603A3-5E43-46CF-AE6C-1463BDDF7948} {9FD298FC-CB6D-4C61-B266-742B66F15A85} = {C68603A3-5E43-46CF-AE6C-1463BDDF7948} {C988A081-663F-4F4B-9302-50735C07FD18} = {DC6E006E-EE9D-481D-B94C-8A53331BCBC1} {2ACC89F1-F7CA-4406-ACD7-3B62DE20686F} = {DC6E006E-EE9D-481D-B94C-8A53331BCBC1} diff --git a/src/Framework/Framework/Hosting/DotvvmPropertySerializableList.cs b/src/Framework/Framework/Hosting/DotvvmPropertySerializableList.cs index f474ef3b28..45f44103ba 100644 --- a/src/Framework/Framework/Hosting/DotvvmPropertySerializableList.cs +++ b/src/Framework/Framework/Hosting/DotvvmPropertySerializableList.cs @@ -14,6 +14,7 @@ static class DotvvmPropertySerializableList { public static SortedDictionary> Properties => DotvvmProperty.AllProperties + .Where(p => !p.DeclaringType.Assembly.IsDynamic) .Where(p => p is not DotvvmCapabilityProperty) .Select(p => new { @@ -46,6 +47,7 @@ static class DotvvmPropertySerializableList public static SortedDictionary> Capabilities => DotvvmProperty.AllProperties + .Where(p => !p.DeclaringType.Assembly.IsDynamic) .OfType() .Select(p => new { @@ -65,6 +67,7 @@ static class DotvvmPropertySerializableList public static SortedDictionary> PropertyGroups => DotvvmPropertyGroup.AllGroups + .Where(p => !p.DeclaringType.Assembly.IsDynamic) .Select(p => new { declaringType = p.DeclaringType, @@ -91,7 +94,7 @@ static class DotvvmPropertySerializableList public static SortedDictionary GetControls(CompiledAssemblyCache assemblies) { var result = new SortedDictionary(StringComparer.OrdinalIgnoreCase); - foreach (var a in assemblies.GetAllAssemblies()) + foreach (var a in assemblies.GetAllAssemblies().Where(a => !a.IsDynamic)) { foreach (var c in a.GetLoadableTypes()) { diff --git a/src/Tests/Binding/JavascriptCompilationTests.cs b/src/Tests/Binding/JavascriptCompilationTests.cs index 5f2a904154..1c323b8337 100644 --- a/src/Tests/Binding/JavascriptCompilationTests.cs +++ b/src/Tests/Binding/JavascriptCompilationTests.cs @@ -63,17 +63,24 @@ public string CompileBinding(Func, Expression> ex [DataRow("'Local' == _this", "\"Local\"==$data")] [DataRow("_this == 2", "$data==\"Local\"")] [DataRow("2 == _this", "\"Local\"==$data")] - [DataRow("_this & 'Local'", "dotvvm.translations.enums.fromInt(dotvvm.translations.enums.toInt($data,\"G0/GAE51KlQlMR5T\")&2,\"G0/GAE51KlQlMR5T\")")] - [DataRow("'Local' & _this", "dotvvm.translations.enums.fromInt(2&dotvvm.translations.enums.toInt($data,\"G0/GAE51KlQlMR5T\"),\"G0/GAE51KlQlMR5T\")")] - [DataRow("_this | 'Local'", "dotvvm.translations.enums.fromInt(dotvvm.translations.enums.toInt($data,\"G0/GAE51KlQlMR5T\")|2,\"G0/GAE51KlQlMR5T\")")] - [DataRow("_this & 1", "dotvvm.translations.enums.fromInt(dotvvm.translations.enums.toInt($data,\"G0/GAE51KlQlMR5T\")&1,\"G0/GAE51KlQlMR5T\")")] - [DataRow("1 & _this", "dotvvm.translations.enums.fromInt(1&dotvvm.translations.enums.toInt($data,\"G0/GAE51KlQlMR5T\"),\"G0/GAE51KlQlMR5T\")")] + [DataRow("_this & 'Local'", "dotvvm.translations.enums.fromInt(dotvvm.translations.enums.toInt($data,\"bmCpvOUHn4NxUNdc\")&2,\"bmCpvOUHn4NxUNdc\")")] + [DataRow("'Local' & _this", "dotvvm.translations.enums.fromInt(2&dotvvm.translations.enums.toInt($data,\"bmCpvOUHn4NxUNdc\"),\"bmCpvOUHn4NxUNdc\")")] + [DataRow("_this | 'Local'", "dotvvm.translations.enums.fromInt(dotvvm.translations.enums.toInt($data,\"bmCpvOUHn4NxUNdc\")|2,\"bmCpvOUHn4NxUNdc\")")] + [DataRow("_this & 1", "dotvvm.translations.enums.fromInt(dotvvm.translations.enums.toInt($data,\"bmCpvOUHn4NxUNdc\")&1,\"bmCpvOUHn4NxUNdc\")")] + [DataRow("1 & _this", "dotvvm.translations.enums.fromInt(1&dotvvm.translations.enums.toInt($data,\"bmCpvOUHn4NxUNdc\"),\"bmCpvOUHn4NxUNdc\")")] public void JavascriptCompilation_EnumOperators(string expr, string expectedJs) { - var js = CompileBinding(expr, typeof(DateTimeKind)); + var js = CompileBinding(expr, typeof(OurDateTimeKind)); Assert.AreEqual(expectedJs, js); } + enum OurDateTimeKind + { + Unspecified = 0, + Utc = 1, + Local = 2, + } + [DataTestMethod] [DataRow("StringProp + StringProp", "(StringProp()??\"\")+(StringProp()??\"\")")] [DataRow("StringProp + null", "StringProp()??\"\"")] diff --git a/src/Tests/DotVVM.Framework.Tests.csproj b/src/Tests/DotVVM.Framework.Tests.csproj index 3194a2cba2..13b8d7c0b7 100644 --- a/src/Tests/DotVVM.Framework.Tests.csproj +++ b/src/Tests/DotVVM.Framework.Tests.csproj @@ -42,7 +42,7 @@ - + diff --git a/src/Tracing/MiniProfiler.Tests/DotVVM.Tracing.MiniProfiler.Tests.csproj b/src/Tracing/MiniProfiler.Tests/DotVVM.Tracing.MiniProfiler.Tests.csproj deleted file mode 100644 index fe966fab42..0000000000 --- a/src/Tracing/MiniProfiler.Tests/DotVVM.Tracing.MiniProfiler.Tests.csproj +++ /dev/null @@ -1,21 +0,0 @@ - - - netcoreapp3.1 - false - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - diff --git a/src/Tracing/MiniProfiler.Tests/WidgetTests.cs b/src/Tracing/MiniProfiler.Tests/WidgetTests.cs deleted file mode 100644 index fa90a8ef1e..0000000000 --- a/src/Tracing/MiniProfiler.Tests/WidgetTests.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System; -using System.IO; -using Xunit; - -namespace DotVVM.Tracing.MiniProfiler.Tests -{ - public class ResourcesTests - { - [Fact] - public void Widget_InlineJavascript() - { - using var reader = new StreamReader(typeof(MiniProfilerWidget).Assembly - .GetManifestResourceStream(MiniProfilerWidget.IntegrationJSEmbeddedResourceName)); - var data = reader.ReadToEnd(); - Assert.NotEmpty(data); - } - } -}