Merge pull request #921 from riganti/upgrade-net5

Updated to .NET 5 wherever possible
riganti · May 22, 2021 · 60df745 · 60df745
2 parents c5751ef + 4bc6a6d
commit 60df745
Show file tree

Hide file tree

Showing 25 changed files with 92 additions and 71 deletions.
diff --git a/src/DotVVM.Compiler/DotVVM.Compiler.csproj b/src/DotVVM.Compiler/DotVVM.Compiler.csproj
@@ -10,12 +10,12 @@ for some reason. What fun. -->
 
   <!-- Related to compilation -->
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net461;net50</TargetFrameworks>
     <IsPackable>true</IsPackable>
     <OutputType>Exe</OutputType>
     <LangVersion>9.0</LangVersion>
     <Nullable>enable</Nullable>
-    <RuntimeIdentifiers>win7-x86;win10-x64;ubuntu.16.10-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win7-x86;win7-x64;win10-x64;ubuntu.16.10-x64</RuntimeIdentifiers>
     <TargetLatestDotNetRuntime>false</TargetLatestDotNetRuntime>
     <CheckEolTargetFramework>false</CheckEolTargetFramework>
     <RollForward>LatestMajor</RollForward>

diff --git a/src/DotVVM.Compiler/ProjectLoader.cs b/src/DotVVM.Compiler/ProjectLoader.cs
@@ -9,7 +9,7 @@ public static class ProjectLoader
     {
         public static ICompilerExecutor GetExecutor(string assemblyPath)
         {
-#if NETCOREAPP3_1
+#if NETCOREAPP3_1_OR_GREATER
             var dependencyResolver = new System.Runtime.Loader.AssemblyDependencyResolver(assemblyPath);
             System.Runtime.Loader.AssemblyLoadContext.Default.Resolving += (c, n) =>
             {

diff --git a/...Api.Swashbuckle.AspNetCore.Tests/DotVVM.Framework.Api.Swashbuckle.AspNetCore.Tests.csproj b/...Api.Swashbuckle.AspNetCore.Tests/DotVVM.Framework.Api.Swashbuckle.AspNetCore.Tests.csproj
@@ -1,16 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.1.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.1.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.2.3" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.3" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="5.4.1" />
   </ItemGroup>
 

diff --git a/...M.Framework.Api.Swashbuckle.Owin.Tests/DotVVM.Framework.Api.Swashbuckle.Owin.Tests.csproj b/...M.Framework.Api.Swashbuckle.Owin.Tests/DotVVM.Framework.Api.Swashbuckle.Owin.Tests.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\MSTest.TestAdapter.2.1.1\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.2.1.1\build\net45\MSTest.TestAdapter.props')" />
+  <Import Project="..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -39,10 +39,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\MSTest.TestFramework.2.1.1\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
+      <HintPath>..\packages\MSTest.TestFramework.2.2.3\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\MSTest.TestFramework.2.1.1\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
+      <HintPath>..\packages\MSTest.TestFramework.2.2.3\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -96,8 +96,8 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.1.1\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.1.1\build\net45\MSTest.TestAdapter.props'))" />
-    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.1.1\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.1.1\build\net45\MSTest.TestAdapter.targets'))" />
+    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.props'))" />
+    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.targets'))" />
   </Target>
-  <Import Project="..\packages\MSTest.TestAdapter.2.1.1\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.2.1.1\build\net45\MSTest.TestAdapter.targets')" />
+  <Import Project="..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.3\build\net45\MSTest.TestAdapter.targets')" />
 </Project>
diff --git a/src/DotVVM.Framework.Api.Swashbuckle.Owin.Tests/packages.config b/src/DotVVM.Framework.Api.Swashbuckle.Owin.Tests/packages.config
@@ -5,8 +5,8 @@
   <package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net461" />
   <package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.3" targetFramework="net461" />
   <package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net461" />
-  <package id="MSTest.TestAdapter" version="2.1.1" targetFramework="net461" />
-  <package id="MSTest.TestFramework" version="2.1.1" targetFramework="net461" />
+  <package id="MSTest.TestAdapter" version="2.2.3" targetFramework="net461" />
+  <package id="MSTest.TestFramework" version="2.2.3" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net461" />
   <package id="Swashbuckle.Core" version="5.6.0" targetFramework="net461" />
 </packages>
diff --git a/src/DotVVM.Framework.Tests/AspCore/Middleware/MiddlewareTest.cs b/src/DotVVM.Framework.Tests/AspCore/Middleware/MiddlewareTest.cs
@@ -8,7 +8,6 @@
 using System.Threading;
 using DotVVM.Framework.Configuration;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using DotVVM.Framework.Configuration;
 
 namespace DotVVM.Framework.Tests.AspCore.Middleware
 {

diff --git a/src/DotVVM.Framework.Tests/DotVVM.Framework.Tests.csproj b/src/DotVVM.Framework.Tests/DotVVM.Framework.Tests.csproj
@@ -6,9 +6,9 @@
     <SignAssembly>True</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net5.0</TargetFramework>
     <LangVersion>latest</LangVersion>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
   <PropertyGroup>
     <PublicSign>True</PublicSign>
@@ -24,17 +24,21 @@
     <ProjectReference Include="..\DotVVM.Framework.Hosting.AspNetCore\DotVVM.Framework.Hosting.AspNetCore.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="AngleSharp" Version="0.14.0" />
-    <PackageReference Include="Ben.Demystifier" Version="0.1.6" />
+    <PackageReference Include="AngleSharp" Version="0.15.0" />
+    <PackageReference Include="Ben.Demystifier" Version="0.4.1" />
     <PackageReference Include="CheckTestOutput" Version="0.4.0" />
     <PackageReference Include="coverlet.collector" Version="3.0.3">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
-    <PackageReference Include="Moq" Version="4.8.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
+    <PackageReference Include="Moq" Version="4.16.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.3" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.2.3" />
+    <PackageReference Include="coverlet.collector" Version="3.0.3">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />

diff --git a/src/DotVVM.Framework.Tests/ViewModel/DefaultViewModelSerializerTests.cs b/src/DotVVM.Framework.Tests/ViewModel/DefaultViewModelSerializerTests.cs
@@ -1,23 +1,23 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.Serialization;
 using System.Security.Principal;
 using DotVVM.Framework.Compilation;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
 using DotVVM.Framework.Configuration;
 using DotVVM.Framework.Controls.Infrastructure;
 using DotVVM.Framework.Hosting;
 using DotVVM.Framework.ResourceManagement;
+using DotVVM.Framework.Routing;
 using DotVVM.Framework.Runtime;
+using DotVVM.Framework.Runtime.Caching;
 using DotVVM.Framework.Security;
 using DotVVM.Framework.ViewModel;
 using DotVVM.Framework.ViewModel.Serialization;
-using Moq;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
 using Newtonsoft.Json.Linq;
-using DotVVM.Framework.Runtime.Caching;
-using DotVVM.Framework.Routing;
-using System.Runtime.Serialization;
 using DotVVM.Framework.Testing;
 
 namespace DotVVM.Framework.Tests.Runtime
@@ -124,7 +124,7 @@ public void DeserializeDictionaryTest()
         {
             var json = SerializeViewModel(new TestViewModel6 {
                 ClassClass = new Dictionary<object, object> { { "obj1", "obj2" } },
-                StructClass= new Dictionary<char, object> { { 'c', "obj" } }
+                StructClass = new Dictionary<char, object> { { 'c', "obj" } }
             });
             var result = new TestViewModel6();
             PopulateViewModel(result, json);

diff --git a/src/DotVVM.Framework.Tests/ViewModel/ViewModelTypeMetadataSerializerTests.cs b/src/DotVVM.Framework.Tests/ViewModel/ViewModelTypeMetadataSerializerTests.cs
@@ -31,21 +31,22 @@ public static void ClassInit(TestContext context)
         [DataRow(typeof(bool), "'Boolean'")]
         [DataRow(typeof(int?), "{'type':'nullable','inner':'Int32'}")]
         [DataRow(typeof(long[][]), "[['Int64']]")]
-        [DataRow(typeof(Type), "'t38YPaufyA26odb7HXM9a+aghdA='")]   // unknown types should produce SHA1 hash
+        [DataRow(typeof(Type), "'cH5MjuCiaO6mnhi5XcZwZcDjjzE='")]   // unknown types should produce SHA1 hash
         [DataRow(typeof(object), "{'type':'dynamic'}")]
-        [DataRow(typeof(Dictionary<string, string>), "[\"Nso/tlXRjzKLze7DMpSAA6GNexA=\"]")]
-        [DataRow(typeof(IDictionary<string, string>), "[\"Nso/tlXRjzKLze7DMpSAA6GNexA=\"]")]
-        [DataRow(typeof(Dictionary<int, int>), "[\"ZuVnwt9Sk9jxAHfC1MSsFdXXlx8=\"]")]
-        [DataRow(typeof(Dictionary<char, object>), "[\"I09vfu0z+ptnAzAp42DrzT4w8Os=\"]")]
-        [DataRow(typeof(IDictionary<int, int>), "[\"ZuVnwt9Sk9jxAHfC1MSsFdXXlx8=\"]")]
-        [DataRow(typeof(Dictionary<object, object>), "[\"JodJCQ9XEOJq1WapjZvsnQQiRH8=\"]")]
-        [DataRow(typeof(IDictionary<object, object>), "[\"JodJCQ9XEOJq1WapjZvsnQQiRH8=\"]")]
-        [DataRow(typeof(List<KeyValuePair<string, string>>), "[\"Nso/tlXRjzKLze7DMpSAA6GNexA=\"]")]
-        [DataRow(typeof(List<KeyValuePair<int, int>>), "[\"ZuVnwt9Sk9jxAHfC1MSsFdXXlx8=\"]")]
-        [DataRow(typeof(List<KeyValuePair<object, object>>), "[\"JodJCQ9XEOJq1WapjZvsnQQiRH8=\"]")]
-        [DataRow(typeof(IList<KeyValuePair<string, string>>), "[\"Nso/tlXRjzKLze7DMpSAA6GNexA=\"]")]
-        [DataRow(typeof(IList<KeyValuePair<int, int>>), "[\"ZuVnwt9Sk9jxAHfC1MSsFdXXlx8=\"]")]
-        [DataRow(typeof(IList<KeyValuePair<object, object>>), "[\"JodJCQ9XEOJq1WapjZvsnQQiRH8=\"]")]
+        [DataRow(typeof(Dictionary<string, string>), "[\"la91iYgFuTBqaCldWgohuFgnQuY=\"]")]
+        [DataRow(typeof(IDictionary<string, string>), "[\"la91iYgFuTBqaCldWgohuFgnQuY=\"]")]
+        [DataRow(typeof(Dictionary<int, int>), "[\"Fj9UR9Ls097H7rqFancApm/DFX0=\"]")]
+        [DataRow(typeof(Dictionary<char, object>), "[\"ODlWlZZ4i8dUWuGS4ZQGfg1utAI=\"]")]
+        [DataRow(typeof(IDictionary<int, int>), "[\"Fj9UR9Ls097H7rqFancApm/DFX0=\"]")]
+        [DataRow(typeof(Dictionary<object, object>), "[\"zJFI46P9nFJ5vtQ7DF8SnVBSmPg=\"]")]
+        [DataRow(typeof(IDictionary<object, object>), "[\"zJFI46P9nFJ5vtQ7DF8SnVBSmPg=\"]")]
+        [DataRow(typeof(List<KeyValuePair<string, string>>), "[\"la91iYgFuTBqaCldWgohuFgnQuY=\"]")]
+        [DataRow(typeof(List<KeyValuePair<int, int>>), "[\"Fj9UR9Ls097H7rqFancApm/DFX0=\"]")]
+        [DataRow(typeof(List<KeyValuePair<object, object>>), "[\"zJFI46P9nFJ5vtQ7DF8SnVBSmPg=\"]")]
+        [DataRow(typeof(IList<KeyValuePair<string, string>>), "[\"la91iYgFuTBqaCldWgohuFgnQuY=\"]")]
+        [DataRow(typeof(IList<KeyValuePair<int, int>>), "[\"Fj9UR9Ls097H7rqFancApm/DFX0=\"]")]
+        [DataRow(typeof(IList<KeyValuePair<object, object>>), "[\"zJFI46P9nFJ5vtQ7DF8SnVBSmPg=\"]")]
+        // these hashes are dependent on the target framework - the latest update of hashes is updated to net50
         public void ViewModelTypeMetadata_TypeName(Type type, string expected)
         {
             var typeMetadataSerializer = new ViewModelTypeMetadataSerializer(mapper);

diff --git a/src/DotVVM.Framework.Tools.SeleniumGenerator/DotVVM.Framework.Tools.SeleniumGenerator.csproj b/src/DotVVM.Framework.Tools.SeleniumGenerator/DotVVM.Framework.Tools.SeleniumGenerator.csproj
@@ -1,6 +1,6 @@
 <Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <AssemblyName>DotVVM.Framework.Tools.SeleniumGenerator</AssemblyName>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>

diff --git a/...VVM.Samples.BasicSamples.Api.AspNetCore/DotVVM.Samples.BasicSamples.Api.AspNetCore.csproj b/...VVM.Samples.BasicSamples.Api.AspNetCore/DotVVM.Samples.BasicSamples.Api.AspNetCore.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/DotVVM.Samples.BasicSamples.Api.AspNetCore/Properties/PublishProfiles/CI.pubxml b/src/DotVVM.Samples.BasicSamples.Api.AspNetCore/Properties/PublishProfiles/CI.pubxml
@@ -13,7 +13,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt
     <ExcludeApp_Data>False</ExcludeApp_Data>
     <publishUrl>c:\www\dotvvm.core.api</publishUrl>
     <DeleteExistingFiles>False</DeleteExistingFiles>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <UsePowerShell>False</UsePowerShell>
   </PropertyGroup>
 </Project>
diff --git a/src/DotVVM.Samples.BasicSamples.AspNetCore/Properties/PublishProfiles/CI.pubxml b/src/DotVVM.Samples.BasicSamples.AspNetCore/Properties/PublishProfiles/CI.pubxml
@@ -13,7 +13,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt
     <ExcludeApp_Data>False</ExcludeApp_Data>
     <publishUrl>c:\www\dotvvm.core</publishUrl>
     <DeleteExistingFiles>False</DeleteExistingFiles>
-    <PublishFramework>netcoreapp2.0</PublishFramework>
+    <PublishFramework>netcoreapp2.1</PublishFramework>
     <UsePowerShell>False</UsePowerShell>
   </PropertyGroup>
 </Project>
diff --git a/...Samples.BasicSamples.AspNetCoreLatest/DotVVM.Samples.BasicSamples.AspNetCoreLatest.csproj b/...Samples.BasicSamples.AspNetCoreLatest/DotVVM.Samples.BasicSamples.AspNetCoreLatest.csproj
@@ -1,6 +1,6 @@
 <Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <OutputType>Exe</OutputType>
   </PropertyGroup>

diff --git a/src/DotVVM.Samples.BasicSamples.AspNetCoreLatest/Properties/PublishProfiles/CI.pubxml b/src/DotVVM.Samples.BasicSamples.AspNetCoreLatest/Properties/PublishProfiles/CI.pubxml
@@ -13,7 +13,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt
     <ExcludeApp_Data>False</ExcludeApp_Data>
     <publishUrl>c:\www\dotvvm.corelatest</publishUrl>
     <DeleteExistingFiles>False</DeleteExistingFiles>
-    <PublishFramework>netcoreapp3.0</PublishFramework>
+    <PublishFramework>net50</PublishFramework>
     <UsePowerShell>False</UsePowerShell>
   </PropertyGroup>
 </Project>
diff --git a/src/DotVVM.Samples.BasicSamples.AspNetCoreLatest/Startup.cs b/src/DotVVM.Samples.BasicSamples.AspNetCoreLatest/Startup.cs
@@ -63,7 +63,7 @@ public void ConfigureServices(IServiceCollection services)
             services.AddScoped<ViewModelScopedDependency>();
         }
 
-        public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)
+        public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory)
         {
             app.UseAuthentication();
 
@@ -85,7 +85,7 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
             app.UseStaticFiles();
         }
 
-        private string GetApplicationPath(IHostingEnvironment env)
+        private string GetApplicationPath(IWebHostEnvironment env)
             => Path.Combine(Path.GetDirectoryName(env.ContentRootPath), "DotVVM.Samples.Common");
     }
 }
diff --git a/...otVVM.Samples.Common/ViewModels/ControlSamples/GridView/GridViewPagingSortingViewModel.cs b/...otVVM.Samples.Common/ViewModels/ControlSamples/GridView/GridViewPagingSortingViewModel.cs
@@ -34,17 +34,13 @@ private static IQueryable<CustomerData> GetData()
             }.AsQueryable();
         }
 
-        public GridViewDataSet<CustomerData> CustomersDataSet { get; set; } = new GridViewDataSet<CustomerData>()
-        {
-            PagingOptions = new PagingOptions()
-            {
+        public GridViewDataSet<CustomerData> CustomersDataSet { get; set; } = new GridViewDataSet<CustomerData>() {
+            PagingOptions = new PagingOptions() {
                 PageSize = 10
             }
         };
-        public GridViewDataSet<CustomerData> EmptyCustomersDataSet { get; set; } = new GridViewDataSet<CustomerData>()
-        {
-            PagingOptions = new PagingOptions()
-            {
+        public GridViewDataSet<CustomerData> EmptyCustomersDataSet { get; set; } = new GridViewDataSet<CustomerData>() {
+            PagingOptions = new PagingOptions() {
                 PageSize = 10
             }
         };
@@ -81,7 +77,16 @@ public override Task PreRender()
 
         public void TestCommand()
         {
-            CustomersDataSet.SetSortExpression("BirthDate");
+            if (CustomersDataSet.SortingOptions.SortExpression == "BirthDate")
+            {
+                CustomersDataSet.SortingOptions.SortDescending = !CustomersDataSet.SortingOptions.SortDescending;
+            }
+            else
+            {
+                CustomersDataSet.PagingOptions.PageIndex = 0;
+                CustomersDataSet.SortingOptions.SortExpression = "BirthDate";
+                CustomersDataSet.SortingOptions.SortDescending = false;
+            }
         }
 
         public void SortCustomers(string column)

diff --git a/src/DotVVM.Samples.Common/ViewModels/ControlSamples/TextBox/TextBoxFormatViewModel.cs b/src/DotVVM.Samples.Common/ViewModels/ControlSamples/TextBox/TextBoxFormatViewModel.cs
@@ -1,10 +1,15 @@
 using System;
+using System.Threading;
 using DotVVM.Framework.Hosting;
 
 namespace DotVVM.Samples.BasicSamples.ViewModels.ControlSamples.TextBox
 {
     public class TextBoxFormatViewModel : QueryStringLocalizableViewModel
     {
+        public TextBoxFormatViewModel()
+        {
+            BindingNumberValueNString = 0.ToString("N", Thread.CurrentThread.CurrentCulture);
+        }
         public DateTime DateValue { get; set; } = DateTime.Parse("2015-12-27T00:00:00.0000000");
         public DateTime? NullableDateValue { get; set; } = DateTime.Parse("2015-12-27T00:00:00.0000000");
         public double NumberValue { get; set; } = 123.123456789;
@@ -16,11 +21,13 @@ public class TextBoxFormatViewModel : QueryStringLocalizableViewModel
         public string DateResult3 => $"{DateTime.Parse("2018-01-01T00:00:00.0000000"):d}";
 
         public double BindingNumberValue { get; set; }
+        public string BindingNumberValueNString { get; set; }
         public double ResultNumberValue { get; set; }
 
         public void ChangedNumberValue()
         {
             ResultNumberValue = BindingNumberValue;
+            BindingNumberValueNString = BindingNumberValue.ToString("N", Thread.CurrentThread.CurrentCulture);
         }
     }
 }
diff --git a/src/DotVVM.Samples.Common/Views/ControlSamples/TextBox/TextBox_Format.dothtml b/src/DotVVM.Samples.Common/Views/ControlSamples/TextBox/TextBox_Format.dothtml
@@ -101,6 +101,7 @@
                      ClientIDMode="Static"
                      Text="{value: ResultNumberValue}">
         </dot:Literal>
+        <span ID="bindingNumberValueNString">{{value: BindingNumberValueNString}}</span>
     </p>
     <div>
         <h3>Switch language</h3>

diff --git a/src/DotVVM.Samples.Common/Views/ControlSamples/TextBox/TextBox_Format_Binding.dothtml b/src/DotVVM.Samples.Common/Views/ControlSamples/TextBox/TextBox_Format_Binding.dothtml
@@ -93,6 +93,7 @@
                      ClientIDMode="Static"
                      Text="{value: ResultNumberValue}">
         </dot:Literal>
+        <span ID="bindingNumberValueNString">{{value: BindingNumberValueNString}}</span>
     </p>
     <div>
         <h3>Switch language</h3>