Merge branch '1.1.0' of github.com:riganti/dotvvm into 1.1.0

riganti · Aug 30, 2017 · bb226e2 · bb226e2
2 parents 7048a9f + bcb2bd3
commit bb226e2
Show file tree

Hide file tree

Showing 18 changed files with 39 additions and 39 deletions.
diff --git a/src/DotVVM.CommandLine/DotVVM.CommandLine.csproj b/src/DotVVM.CommandLine/DotVVM.CommandLine.csproj
@@ -3,13 +3,13 @@
   <PropertyGroup>
     <AssemblyTitle>DotVVM.CommandLine</AssemblyTitle>
     <AssemblyName>dotnet-dotvvm</AssemblyName>
-    <VersionPrefix>1.1.6</VersionPrefix>
+    <VersionPrefix>1.1.6.1-beta</VersionPrefix>
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <AssemblyOriginatorKeyFile>dotvvmwizard.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
     <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
     <PackageId>DotVVM.CommandLine</PackageId>
-    <PackageVersion>1.1.6</PackageVersion>
+    <PackageVersion>1.1.6.1-beta</PackageVersion>
     <Authors>RIGANTI</Authors>
     <Description>Command-line tools for DotVVM.</Description>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>

diff --git a/src/DotVVM.CommandLine/Properties/AssemblyInfo.cs b/src/DotVVM.CommandLine/Properties/AssemblyInfo.cs
@@ -27,6 +27,6 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.1.6")]
-[assembly: AssemblyVersion("1.1.6")]
-[assembly: AssemblyFileVersion("1.1.6")]
+// [assembly: AssemblyVersion("1.1.6.1")]
+[assembly: AssemblyVersion("1.1.6.1")]
+[assembly: AssemblyFileVersion("1.1.6.1")]
diff --git a/src/DotVVM.Compiler.Light/DotVVM.Compiler.Light.csproj b/src/DotVVM.Compiler.Light/DotVVM.Compiler.Light.csproj
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <VersionPrefix>1.1.6</VersionPrefix>
+    <VersionPrefix>1.1.6.1-beta</VersionPrefix>
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <AssemblyName>dotnet-dotvvm-compiler</AssemblyName>
     <PackageId>DotVVM.Compiler.Light</PackageId>
-    <PackageVersion>1.1.6</PackageVersion>
+    <PackageVersion>1.1.6.1-beta</PackageVersion>
     <Authors>RIGANTI</Authors>
     <Description>Command-line compiler for DotVVM.</Description>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>

diff --git a/src/DotVVM.Compiler.Light/Properties/AssemblyInfo.cs b/src/DotVVM.Compiler.Light/Properties/AssemblyInfo.cs
@@ -27,6 +27,6 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.1.6")]
-[assembly: AssemblyVersion("1.1.6")]
-[assembly: AssemblyFileVersion("1.1.6")]
+// [assembly: AssemblyVersion("1.1.6.1")]
+[assembly: AssemblyVersion("1.1.6.1")]
+[assembly: AssemblyFileVersion("1.1.6.1")]
diff --git a/src/DotVVM.Core/DotVVM.Core.csproj b/src/DotVVM.Core/DotVVM.Core.csproj
@@ -1,6 +1,6 @@
 <Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <VersionPrefix>1.1.6</VersionPrefix>
+    <VersionPrefix>1.1.6.1-beta</VersionPrefix>
     <TargetFrameworks>netstandard1.6;net451</TargetFrameworks>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -17,7 +17,7 @@
     <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
     <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
     <PackageId>DotVVM.Core</PackageId>
-    <PackageVersion>1.1.6</PackageVersion>
+    <PackageVersion>1.1.6.1-beta</PackageVersion>
     <Authors>RIGANTI</Authors>
     <Description>This package contains base classes and interfaces of DotVVM that might be useful in a business layer.
     DotVVM is an open source ASP.NET-based framework which allows to build modern web apps without writing any JavaScript code.</Description>

diff --git a/src/DotVVM.Core/Properties/AssemblyInfo.cs b/src/DotVVM.Core/Properties/AssemblyInfo.cs
@@ -28,6 +28,6 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.1.6")]
-[assembly: AssemblyVersion("1.1.6")]
-[assembly: AssemblyFileVersion("1.1.6")]
+// [assembly: AssemblyVersion("1.1.6.1")]
+[assembly: AssemblyVersion("1.1.6.1")]
+[assembly: AssemblyFileVersion("1.1.6.1")]
diff --git a/src/DotVVM.Framework.Hosting.AspNetCore/DotVVM.Framework.Hosting.AspNetCore.csproj b/src/DotVVM.Framework.Hosting.AspNetCore/DotVVM.Framework.Hosting.AspNetCore.csproj
@@ -1,6 +1,6 @@
 <Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <VersionPrefix>1.1.6</VersionPrefix>
+    <VersionPrefix>1.1.6.1-beta</VersionPrefix>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -17,7 +17,7 @@
     <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
     <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
     <PackageId>DotVVM.AspNetCore</PackageId>
-    <PackageVersion>1.1.6</PackageVersion>
+    <PackageVersion>1.1.6.1-beta</PackageVersion>
     <Authors>RIGANTI</Authors>
     <Description>
       This package contains ASP.NET Core middleware and hosting infrastructure for DotVVM apps. It supports both .NET Framework and .NET Core.

diff --git a/src/DotVVM.Framework.Hosting.AspNetCore/Properties/AssemblyInfo.cs b/src/DotVVM.Framework.Hosting.AspNetCore/Properties/AssemblyInfo.cs
@@ -18,8 +18,8 @@
 // to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("1.1.6")]
-[assembly: AssemblyFileVersion("1.1.6")]
+[assembly: AssemblyVersion("1.1.6.1")]
+[assembly: AssemblyFileVersion("1.1.6.1")]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("c5af6a0d-5416-44d4-b14d-8ffdd1b0e99b")]
diff --git a/src/DotVVM.Framework.Hosting.Owin/DotVVM.Framework.Hosting.Owin.csproj b/src/DotVVM.Framework.Hosting.Owin/DotVVM.Framework.Hosting.Owin.csproj
@@ -1,6 +1,6 @@
 <Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <VersionPrefix>1.1.6</VersionPrefix>
+    <VersionPrefix>1.1.6.1-beta</VersionPrefix>
     <TargetFramework>net451</TargetFramework>
     <RuntimeIdentifiers>win7-x64;win7-x86</RuntimeIdentifiers>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -17,7 +17,7 @@
     <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
     <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
     <PackageId>DotVVM.Owin</PackageId>
-    <PackageVersion>1.1.6</PackageVersion>
+    <PackageVersion>1.1.6.1-beta</PackageVersion>
     <Authors>RIGANTI</Authors>
     <Description>
       This package contains OWIN middleware and hosting infrastructure for DotVVM apps.

diff --git a/src/DotVVM.Framework.Hosting.Owin/Properties/AssemblyInfo.cs b/src/DotVVM.Framework.Hosting.Owin/Properties/AssemblyInfo.cs
@@ -18,8 +18,8 @@
 // to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("1.1.6")]
-[assembly: AssemblyFileVersion("1.1.6")]
+[assembly: AssemblyVersion("1.1.6.1")]
+[assembly: AssemblyFileVersion("1.1.6.1")]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("6DACF57C-91E9-4B2B-AF54-F09989BD8ED6")]
diff --git a/src/DotVVM.Framework/DotVVM.Framework.csproj b/src/DotVVM.Framework/DotVVM.Framework.csproj
@@ -1,15 +1,15 @@
 <Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyTitle>DotVVM</AssemblyTitle>
-    <VersionPrefix>1.1.6</VersionPrefix>
+    <VersionPrefix>1.1.6.1-beta</VersionPrefix>
     <TargetFrameworks>netstandard2.0;net451</TargetFrameworks>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyOriginatorKeyFile>dotvvmwizard.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
     <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
     <PackageId>DotVVM</PackageId>
-    <PackageVersion>1.1.6</PackageVersion>
+    <PackageVersion>1.1.6.1-beta</PackageVersion>
     <Authors>RIGANTI</Authors>
     <Description>DotVVM is an open source ASP.NET-based framework which allows to build modern web apps without writing any JavaScript code.</Description>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>

diff --git a/src/DotVVM.Framework/Properties/AssemblyInfo.cs b/src/DotVVM.Framework/Properties/AssemblyInfo.cs
@@ -31,9 +31,9 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.1.6")]
-[assembly: AssemblyVersion("1.1.6")]
-[assembly: AssemblyFileVersion("1.1.6")]
+// [assembly: AssemblyVersion("1.1.6.1")]
+[assembly: AssemblyVersion("1.1.6.1")]
+[assembly: AssemblyFileVersion("1.1.6.1")]
 
 [assembly: InternalsVisibleTo("DotVVM.Framework.Tests.Common, PublicKey=002400000480000094000000060200000024000052534131000400000100010007c544d7dbb49a258f8f7509b74f488534c1872c417b2fba85a66b1fba2465caafbaec56663cab0f072cd801f9e22753a85dc55247d4ace012a5eceac50d84c3b9044b9a37ac8baa5eb24dec644ad9fafcc869ad93b6603ffd5321124362cf0ab3684b89db1ed2aca4f175f6fbfc770bdc076396b36017c6dce5a4385c7b67b7")]
 [assembly: InternalsVisibleTo("DotVVM.Framework.Tests.Owin, PublicKey=002400000480000094000000060200000024000052534131000400000100010007c544d7dbb49a258f8f7509b74f488534c1872c417b2fba85a66b1fba2465caafbaec56663cab0f072cd801f9e22753a85dc55247d4ace012a5eceac50d84c3b9044b9a37ac8baa5eb24dec644ad9fafcc869ad93b6603ffd5321124362cf0ab3684b89db1ed2aca4f175f6fbfc770bdc076396b36017c6dce5a4385c7b67b7")]

diff --git a/...acing.ApplicationInsights.AspNetCore/DotVVM.Tracing.ApplicationInsights.AspNetCore.csproj b/...acing.ApplicationInsights.AspNetCore/DotVVM.Tracing.ApplicationInsights.AspNetCore.csproj
@@ -2,15 +2,15 @@
 
   <PropertyGroup>
     <AssemblyTitle>DotVVM.Tracing.ApplicationInsights.AspNetCore</AssemblyTitle>
-    <VersionPrefix>1.1.6</VersionPrefix>
+    <VersionPrefix>1.1.6.1-beta</VersionPrefix>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyOriginatorKeyFile>dotvvmwizard.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
     <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
     <PackageId>DotVVM.Tracing.ApplicationInsights.AspNetCore</PackageId>
-    <PackageVersion>1.1.6</PackageVersion>
+    <PackageVersion>1.1.6.1-beta</PackageVersion>
     <Authors>RIGANTI</Authors>
     <Description>Application Insights Tracing module for ASP.NET Core DotVVM</Description>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>

diff --git a/src/DotVVM.Tracing.ApplicationInsights.Owin/DotVVM.Tracing.ApplicationInsights.Owin.csproj b/src/DotVVM.Tracing.ApplicationInsights.Owin/DotVVM.Tracing.ApplicationInsights.Owin.csproj
@@ -2,15 +2,15 @@
 
   <PropertyGroup>
     <AssemblyTitle>DotVVM.Tracing.ApplicationInsights.Owin</AssemblyTitle>
-    <VersionPrefix>1.1.6</VersionPrefix>
+    <VersionPrefix>1.1.6.1-beta</VersionPrefix>
     <TargetFrameworks>net451</TargetFrameworks>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyOriginatorKeyFile>dotvvmwizard.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
     <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
     <PackageId>DotVVM.Tracing.ApplicationInsights.Owin</PackageId>
-    <PackageVersion>1.1.6</PackageVersion>
+    <PackageVersion>1.1.6.1-beta</PackageVersion>
     <Authors>RIGANTI</Authors>
     <Description>Application Insights Tracing module for OWIN and DotVVM</Description>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>

diff --git a/src/DotVVM.Tracing.ApplicationInsights/DotVVM.Tracing.ApplicationInsights.csproj b/src/DotVVM.Tracing.ApplicationInsights/DotVVM.Tracing.ApplicationInsights.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyTitle>DotVVM.Tracing.ApplicationInsights</AssemblyTitle>
-    <VersionPrefix>1.1.6</VersionPrefix>
+    <VersionPrefix>1.1.6.1-beta</VersionPrefix>
     <TargetFrameworks>netstandard2.0;net451</TargetFrameworks>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyOriginatorKeyFile>dotvvmwizard.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
     <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
     <PackageId>DotVVM.Tracing.ApplicationInsights</PackageId>
-    <PackageVersion>1.1.6</PackageVersion>
+    <PackageVersion>1.1.6.1-beta</PackageVersion>
     <Authors>RIGANTI</Authors>
     <Description>Common infrastructure for Application Insights Tracing module for DotVVM</Description>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>

diff --git a/src/DotVVM.Tracing.MiniProfiler.AspNetCore/DotVVM.Tracing.MiniProfiler.AspNetCore.csproj b/src/DotVVM.Tracing.MiniProfiler.AspNetCore/DotVVM.Tracing.MiniProfiler.AspNetCore.csproj
@@ -2,15 +2,15 @@
 
   <PropertyGroup>
 	<AssemblyTitle>DotVVM.Tracing.MiniProfiler.AspNetCore</AssemblyTitle>
-    <VersionPrefix>1.1.6</VersionPrefix>
+    <VersionPrefix>1.1.6.1-beta</VersionPrefix>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyOriginatorKeyFile>dotvvmwizard.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
     <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
     <PackageId>DotVVM.Tracing.MiniProfiler.AspNetCore</PackageId>
-    <PackageVersion>1.1.6</PackageVersion>
+    <PackageVersion>1.1.6.1-beta</PackageVersion>
     <Authors>RIGANTI</Authors>
     <Description>MiniProfiler Tracing module for ASP.NET Core and DotVVM</Description>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>

diff --git a/src/DotVVM.Tracing.MiniProfiler.Owin/DotVVM.Tracing.MiniProfiler.Owin.csproj b/src/DotVVM.Tracing.MiniProfiler.Owin/DotVVM.Tracing.MiniProfiler.Owin.csproj
@@ -2,15 +2,15 @@
 
   <PropertyGroup>
   	<AssemblyTitle>DotVVM.Tracing.MiniProfiler.Owin</AssemblyTitle>
-    <VersionPrefix>1.1.6</VersionPrefix>
+    <VersionPrefix>1.1.6.1-beta</VersionPrefix>
     <TargetFramework>net451</TargetFramework>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyOriginatorKeyFile>dotvvmwizard.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
     <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
     <PackageId>DotVVM.Tracing.MiniProfiler.Owin</PackageId>
-    <PackageVersion>1.1.6</PackageVersion>
+    <PackageVersion>1.1.6.1-beta</PackageVersion>
     <Authors>RIGANTI</Authors>
     <Description>MiniProfiler Tracing module for OWIN and DotVVM</Description>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>

diff --git a/src/Templates/DotVVM.Templates.nuspec b/src/Templates/DotVVM.Templates.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>DotVVM.Templates</id>
-    <version>1.1.6</version>
+    <version>1.1.6.1-beta</version>
     <authors>RIGANTI</authors>
     <description>DotVVM Project Templates</description>
     <language>en-US</language>