Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/riganti/dotvvm
Browse files Browse the repository at this point in the history
  • Loading branch information
Leeemons committed Sep 13, 2018
2 parents a4e7a90 + 56c1e09 commit 994b54b
Show file tree
Hide file tree
Showing 15 changed files with 30 additions and 30 deletions.
4 changes: 2 additions & 2 deletions src/DotVVM.CommandLine/DotVVM.CommandLine.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
<PropertyGroup>
<AssemblyTitle>DotVVM.CommandLine</AssemblyTitle>
<AssemblyName>dotnet-dotvvm</AssemblyName>
<VersionPrefix>2.0.2</VersionPrefix>
<VersionPrefix>2.0.3-preview01-final</VersionPrefix>
<TargetFramework>netcoreapp2.0</TargetFramework>
<AssemblyOriginatorKeyFile>dotvvmwizard.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
<PackageId>DotVVM.CommandLine</PackageId>
<PackageVersion>2.0.2</PackageVersion>
<PackageVersion>2.0.3-preview01-final</PackageVersion>
<Authors>RIGANTI</Authors>
<Description>Command-line tools for DotVVM.</Description>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
Expand Down
6 changes: 3 additions & 3 deletions src/DotVVM.CommandLine/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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("2.0.2")]
[assembly: AssemblyVersion("2.0.2")]
[assembly: AssemblyFileVersion("2.0.2")]
// [assembly: AssemblyVersion("2.0.3")]
[assembly: AssemblyVersion("2.0.3")]
[assembly: AssemblyFileVersion("2.0.3")]
4 changes: 2 additions & 2 deletions src/DotVVM.Compiler.Light/DotVVM.Compiler.Light.csproj
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<VersionPrefix>2.0.2</VersionPrefix>
<VersionPrefix>2.0.3-preview01-final</VersionPrefix>
<TargetFramework>netcoreapp2.0</TargetFramework>
<AssemblyName>dotnet-dotvvm-compiler</AssemblyName>
<PackageId>DotVVM.Compiler.Light</PackageId>
<PackageVersion>2.0.2</PackageVersion>
<PackageVersion>2.0.3-preview01-final</PackageVersion>
<Authors>RIGANTI</Authors>
<Description>Command-line compiler for DotVVM.</Description>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
Expand Down
4 changes: 2 additions & 2 deletions src/DotVVM.Compiler.Light/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("2.0.2")]
[assembly: AssemblyFileVersion("2.0.2")]
[assembly: AssemblyVersion("2.0.3")]
[assembly: AssemblyFileVersion("2.0.3")]
4 changes: 2 additions & 2 deletions src/DotVVM.Core/DotVVM.Core.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<VersionPrefix>2.0.2</VersionPrefix>
<VersionPrefix>2.0.3-preview01-final</VersionPrefix>
<TargetFrameworks>netstandard1.6;net451</TargetFrameworks>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
Expand All @@ -17,7 +17,7 @@
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
<PackageId>DotVVM.Core</PackageId>
<PackageVersion>2.0.2</PackageVersion>
<PackageVersion>2.0.3-preview01-final</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>
Expand Down
6 changes: 3 additions & 3 deletions src/DotVVM.Core/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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("2.0.2")]
[assembly: AssemblyVersion("2.0.2")]
[assembly: AssemblyFileVersion("2.0.2")]
// [assembly: AssemblyVersion("2.0.3")]
[assembly: AssemblyVersion("2.0.3")]
[assembly: AssemblyFileVersion("2.0.3")]
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<PackageId>DotVVM.Api.Swashbuckle.AspNetCore</PackageId>
<PackageVersion>2.0.2</PackageVersion>
<PackageVersion>2.0.3-preview01-final</PackageVersion>
<Authors>RIGANTI</Authors>
<Description>Swashbuckle.AspNetCore extensions for DotVVM.</Description>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net451</TargetFramework>
<PackageId>DotVVM.Api.Swashbuckle.Owin</PackageId>
<PackageVersion>2.0.2</PackageVersion>
<PackageVersion>2.0.3-preview01-final</PackageVersion>
<Authors>RIGANTI</Authors>
<Description>Swashbuckle.Owin extensions for DotVVM.</Description>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<VersionPrefix>2.0.2</VersionPrefix>
<VersionPrefix>2.0.3-preview01-final</VersionPrefix>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
Expand All @@ -17,7 +17,7 @@
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
<PackageId>DotVVM.AspNetCore</PackageId>
<PackageVersion>2.0.2</PackageVersion>
<PackageVersion>2.0.3-preview01-final</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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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("2.0.2")]
[assembly: AssemblyFileVersion("2.0.2")]
[assembly: AssemblyVersion("2.0.3")]
[assembly: AssemblyFileVersion("2.0.3")]

// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("c5af6a0d-5416-44d4-b14d-8ffdd1b0e99b")]
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<VersionPrefix>2.0.2</VersionPrefix>
<VersionPrefix>2.0.3-preview01-final</VersionPrefix>
<TargetFramework>net451</TargetFramework>
<RuntimeIdentifiers>win7-x64;win7-x86</RuntimeIdentifiers>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
Expand All @@ -17,7 +17,7 @@
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
<PackageId>DotVVM.Owin</PackageId>
<PackageVersion>2.0.2</PackageVersion>
<PackageVersion>2.0.3-preview01-final</PackageVersion>
<Authors>RIGANTI</Authors>
<Description>
This package contains OWIN middleware and hosting infrastructure for DotVVM apps.
Expand Down
4 changes: 2 additions & 2 deletions src/DotVVM.Framework.Hosting.Owin/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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("2.0.2")]
[assembly: AssemblyFileVersion("2.0.2")]
[assembly: AssemblyVersion("2.0.3")]
[assembly: AssemblyFileVersion("2.0.3")]

// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("6DACF57C-91E9-4B2B-AF54-F09989BD8ED6")]
4 changes: 2 additions & 2 deletions src/DotVVM.Framework/DotVVM.Framework.csproj
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AssemblyTitle>DotVVM</AssemblyTitle>
<VersionPrefix>2.0.2</VersionPrefix>
<VersionPrefix>2.0.3-preview01-final</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>2.0.2</PackageVersion>
<PackageVersion>2.0.3-preview01-final</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>
Expand Down
6 changes: 3 additions & 3 deletions src/DotVVM.Framework/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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("2.0.2")]
[assembly: AssemblyVersion("2.0.2")]
[assembly: AssemblyFileVersion("2.0.2")]
// [assembly: AssemblyVersion("2.0.3")]
[assembly: AssemblyVersion("2.0.3")]
[assembly: AssemblyFileVersion("2.0.3")]

[assembly: InternalsVisibleTo("DotVVM.Framework.Tests.Common, PublicKey=002400000480000094000000060200000024000052534131000400000100010007c544d7dbb49a258f8f7509b74f488534c1872c417b2fba85a66b1fba2465caafbaec56663cab0f072cd801f9e22753a85dc55247d4ace012a5eceac50d84c3b9044b9a37ac8baa5eb24dec644ad9fafcc869ad93b6603ffd5321124362cf0ab3684b89db1ed2aca4f175f6fbfc770bdc076396b36017c6dce5a4385c7b67b7")]
[assembly: InternalsVisibleTo("DotVVM.Framework.Tests.Owin, PublicKey=002400000480000094000000060200000024000052534131000400000100010007c544d7dbb49a258f8f7509b74f488534c1872c417b2fba85a66b1fba2465caafbaec56663cab0f072cd801f9e22753a85dc55247d4ace012a5eceac50d84c3b9044b9a37ac8baa5eb24dec644ad9fafcc869ad93b6603ffd5321124362cf0ab3684b89db1ed2aca4f175f6fbfc770bdc076396b36017c6dce5a4385c7b67b7")]
Expand Down
2 changes: 1 addition & 1 deletion src/Templates/DotVVM.Templates.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>DotVVM.Templates</id>
<version>2.0.2</version>
<version>2.0.3-preview01-final</version>
<authors>RIGANTI</authors>
<description>DotVVM Project Templates</description>
<language>en-US</language>
Expand Down

0 comments on commit 994b54b

Please sign in to comment.