Revert "NuGet package version 2.4.0-preview07-final"

This reverts commit e2151e0, reversing changes made to 76abeb8.
riganti · Dec 15, 2019 · ebaf3aa · ebaf3aa
1 parent f8a9cb6
commit ebaf3aa
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 82 deletions.
diff --git a/src/DotVVM.CommandLine/DotVVM.CommandLine.csproj b/src/DotVVM.CommandLine/DotVVM.CommandLine.csproj
@@ -3,23 +3,15 @@
   <PropertyGroup>
     <AssemblyTitle>DotVVM.CommandLine</AssemblyTitle>
     <AssemblyName>dotnet-dotvvm</AssemblyName>
-<<<<<<< HEAD
-    <VersionPrefix>2.4.0-preview07-final</VersionPrefix>
-=======
-    <VersionPrefix>2.4.0-preview07-final</VersionPrefix>
->>>>>>> 76abeb8520ef79f07ea4f0fdfc9368695fd2efdf
+    <VersionPrefix>2.4.0-preview06-final</VersionPrefix>
     <TargetFramework>netcoreapp2.1</TargetFramework>
     <AssemblyOriginatorKeyFile>dotvvmwizard.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
     <PackAsTool>true</PackAsTool>
     <ToolCommandName>dotvvm</ToolCommandName>
     <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
     <PackageId>DotVVM.CommandLine</PackageId>
-<<<<<<< HEAD
-    <PackageVersion>2.4.0-preview07-final</PackageVersion>
-=======
-    <PackageVersion>2.4.0-preview07-final</PackageVersion>
->>>>>>> 76abeb8520ef79f07ea4f0fdfc9368695fd2efdf
+    <PackageVersion>2.4.0-preview06-final</PackageVersion>
     <Authors>RIGANTI</Authors>
     <Description>Command-line tools for DotVVM.</Description>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>

diff --git a/src/DotVVM.Compiler.Light/DotVVM.Compiler.Light.csproj b/src/DotVVM.Compiler.Light/DotVVM.Compiler.Light.csproj
@@ -1,19 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-<<<<<<< HEAD
-    <VersionPrefix>2.4.0-preview07-final</VersionPrefix>
+    <VersionPrefix>2.4.0-preview06-final</VersionPrefix>
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <AssemblyName>dotnet-dotvvm-compiler</AssemblyName>
     <PackageId>DotVVM.Compiler.Light</PackageId>
-    <PackageVersion>2.4.0-preview07-final</PackageVersion>
-=======
-    <VersionPrefix>2.4.0-preview07-final</VersionPrefix>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
-    <AssemblyName>dotnet-dotvvm-compiler</AssemblyName>
-    <PackageId>DotVVM.Compiler.Light</PackageId>
-    <PackageVersion>2.4.0-preview07-final</PackageVersion>
->>>>>>> 76abeb8520ef79f07ea4f0fdfc9368695fd2efdf
+    <PackageVersion>2.4.0-preview06-final</PackageVersion>
     <Authors>RIGANTI</Authors>
     <Description>Command-line compiler for DotVVM.</Description>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>

diff --git a/src/DotVVM.Core/DotVVM.Core.csproj b/src/DotVVM.Core/DotVVM.Core.csproj
@@ -1,10 +1,6 @@
 <Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-<<<<<<< HEAD
-    <VersionPrefix>2.4.0-preview07-final</VersionPrefix>
-=======
-    <VersionPrefix>2.4.0-preview07-final</VersionPrefix>
->>>>>>> 76abeb8520ef79f07ea4f0fdfc9368695fd2efdf
+    <VersionPrefix>2.4.0-preview06-final</VersionPrefix>
     <TargetFrameworks>netstandard1.6;net451</TargetFrameworks>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -21,11 +17,7 @@
     <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
     <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
     <PackageId>DotVVM.Core</PackageId>
-<<<<<<< HEAD
-    <PackageVersion>2.4.0-preview07-final</PackageVersion>
-=======
-    <PackageVersion>2.4.0-preview07-final</PackageVersion>
->>>>>>> 76abeb8520ef79f07ea4f0fdfc9368695fd2efdf
+    <PackageVersion>2.4.0-preview06-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>

diff --git a/...M.Framework.Api.Swashbuckle.AspNetCore/DotVVM.Framework.Api.Swashbuckle.AspNetCore.csproj b/...M.Framework.Api.Swashbuckle.AspNetCore/DotVVM.Framework.Api.Swashbuckle.AspNetCore.csproj
@@ -3,11 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <PackageId>DotVVM.Api.Swashbuckle.AspNetCore</PackageId>
-<<<<<<< HEAD
-    <PackageVersion>2.4.0-preview07-final</PackageVersion>
-=======
-    <PackageVersion>2.4.0-preview07-final</PackageVersion>
->>>>>>> 76abeb8520ef79f07ea4f0fdfc9368695fd2efdf
+    <PackageVersion>2.4.0-preview06-final</PackageVersion>
     <Authors>RIGANTI</Authors>
     <Description>Swashbuckle.AspNetCore extensions for DotVVM.</Description>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>

diff --git a/src/DotVVM.Framework.Api.Swashbuckle.Owin/DotVVM.Framework.Api.Swashbuckle.Owin.csproj b/src/DotVVM.Framework.Api.Swashbuckle.Owin/DotVVM.Framework.Api.Swashbuckle.Owin.csproj
@@ -3,11 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net451</TargetFramework>
     <PackageId>DotVVM.Api.Swashbuckle.Owin</PackageId>
-<<<<<<< HEAD
-    <PackageVersion>2.4.0-preview07-final</PackageVersion>
-=======
-    <PackageVersion>2.4.0-preview07-final</PackageVersion>
->>>>>>> 76abeb8520ef79f07ea4f0fdfc9368695fd2efdf
+    <PackageVersion>2.4.0-preview06-final</PackageVersion>
     <Authors>RIGANTI</Authors>
     <Description>Swashbuckle.Owin extensions for DotVVM.</Description>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>

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,10 +1,6 @@
 <Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-<<<<<<< HEAD
-    <VersionPrefix>2.4.0-preview07-final</VersionPrefix>
-=======
-    <VersionPrefix>2.4.0-preview07-final</VersionPrefix>
->>>>>>> 76abeb8520ef79f07ea4f0fdfc9368695fd2efdf
+    <VersionPrefix>2.4.0-preview06-final</VersionPrefix>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -21,11 +17,7 @@
     <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
     <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
     <PackageId>DotVVM.AspNetCore</PackageId>
-<<<<<<< HEAD
-    <PackageVersion>2.4.0-preview07-final</PackageVersion>
-=======
-    <PackageVersion>2.4.0-preview07-final</PackageVersion>
->>>>>>> 76abeb8520ef79f07ea4f0fdfc9368695fd2efdf
+    <PackageVersion>2.4.0-preview06-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.

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,10 +1,6 @@
 <Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-<<<<<<< HEAD
-    <VersionPrefix>2.4.0-preview07-final</VersionPrefix>
-=======
-    <VersionPrefix>2.4.0-preview07-final</VersionPrefix>
->>>>>>> 76abeb8520ef79f07ea4f0fdfc9368695fd2efdf
+    <VersionPrefix>2.4.0-preview06-final</VersionPrefix>
     <TargetFramework>net451</TargetFramework>
     <RuntimeIdentifiers>win7-x64;win7-x86</RuntimeIdentifiers>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -21,11 +17,7 @@
     <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
     <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
     <PackageId>DotVVM.Owin</PackageId>
-<<<<<<< HEAD
-    <PackageVersion>2.4.0-preview07-final</PackageVersion>
-=======
-    <PackageVersion>2.4.0-preview07-final</PackageVersion>
->>>>>>> 76abeb8520ef79f07ea4f0fdfc9368695fd2efdf
+    <PackageVersion>2.4.0-preview06-final</PackageVersion>
     <Authors>RIGANTI</Authors>
     <Description>
       This package contains OWIN middleware and hosting infrastructure for DotVVM apps.

diff --git a/src/DotVVM.Framework/DotVVM.Framework.csproj b/src/DotVVM.Framework/DotVVM.Framework.csproj
@@ -1,25 +1,15 @@
 <Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyTitle>DotVVM</AssemblyTitle>
-<<<<<<< HEAD
-    <VersionPrefix>2.4.0-preview07-final</VersionPrefix>
-    <TargetFrameworks>netstandard2.0;net451</TargetFrameworks>
-    <NoWarn>$(NoWarn);CS1591</NoWarn>
-=======
-    <VersionPrefix>2.4.0-preview07-final</VersionPrefix>
+    <VersionPrefix>2.4.0-preview06-final</VersionPrefix>
     <TargetFrameworks>net451;netstandard2.0;netstandard2.1</TargetFrameworks>
     <NoWarn>$(NoWarn);CS1591;CS1573</NoWarn>
->>>>>>> 76abeb8520ef79f07ea4f0fdfc9368695fd2efdf
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyOriginatorKeyFile>dotvvmwizard.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
     <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
     <PackageId>DotVVM</PackageId>
-<<<<<<< HEAD
-    <PackageVersion>2.4.0-preview07-final</PackageVersion>
-=======
-    <PackageVersion>2.4.0-preview07-final</PackageVersion>
->>>>>>> 76abeb8520ef79f07ea4f0fdfc9368695fd2efdf
+    <PackageVersion>2.4.0-preview06-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>

diff --git a/src/DotVVM.Framework/Resources/Scripts/DotVVM.min.js b/src/DotVVM.Framework/Resources/Scripts/DotVVM.min.js
diff --git a/src/Templates/DotVVM.Templates.nuspec b/src/Templates/DotVVM.Templates.nuspec
@@ -2,11 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>DotVVM.Templates</id>
-<<<<<<< HEAD
-    <version>2.4.0-preview07-final</version>
-=======
-    <version>2.4.0-preview07-final</version>
->>>>>>> 76abeb8520ef79f07ea4f0fdfc9368695fd2efdf
+    <version>2.4.0-preview06-final</version>
     <authors>RIGANTI</authors>
     <description>DotVVM Project Templates</description>
     <language>en-US</language>