From 7e02ce93a8701efec64e160e31722362ee3a2882 Mon Sep 17 00:00:00 2001
From: Galip Tolga Erdem <galiperdem@gmail.com>
Date: Wed, 11 Nov 2020 13:24:53 +0300
Subject: [PATCH 1/4] vue package update

---
 .../Abp/AspNetCore/Mvc/UI/Packages/Vue/VueScriptContributor.cs  | 2 +-
 npm/packs/vue/package.json                                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Vue/VueScriptContributor.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Vue/VueScriptContributor.cs
index c9764db0d2..c5740cd94b 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Vue/VueScriptContributor.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Vue/VueScriptContributor.cs
@@ -6,7 +6,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.Vue
     {
         public override void ConfigureBundle(BundleConfigurationContext context)
         {
-            context.Files.Add("/libs/vue/vue.global.prod.js");
+            context.Files.Add("/libs/vue/vue.min.js");
         }
     }
 }
diff --git a/npm/packs/vue/package.json b/npm/packs/vue/package.json
index 77d386aaaf..8228712abc 100644
--- a/npm/packs/vue/package.json
+++ b/npm/packs/vue/package.json
@@ -5,7 +5,7 @@
     "access": "public"
   },
   "dependencies": {
-    "vue": "~3.0.2"
+    "vue": "~2.6.2"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
 }

From f6fb0c797ab6be83610f9447d7e77de0a361fc4d Mon Sep 17 00:00:00 2001
From: Galip Tolga Erdem <galiperdem@gmail.com>
Date: Wed, 11 Nov 2020 13:26:45 +0300
Subject: [PATCH 2/4] Update package.json

---
 npm/packs/vue/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/npm/packs/vue/package.json b/npm/packs/vue/package.json
index 8228712abc..bc1b173d3f 100644
--- a/npm/packs/vue/package.json
+++ b/npm/packs/vue/package.json
@@ -5,7 +5,7 @@
     "access": "public"
   },
   "dependencies": {
-    "vue": "~2.6.2"
+    "vue": "~2.6.12"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
 }

From d4e842c1f8d29cb7904a331e0706a54fec2ee807 Mon Sep 17 00:00:00 2001
From: Mladen Macanovic <mladen.macanovic@gmail.com>
Date: Wed, 11 Nov 2020 11:42:07 +0100
Subject: [PATCH 3/4] Update Blazorise to .Net5

---
 .../src/Volo.Abp.BlazoriseUI/Volo.Abp.BlazoriseUI.csproj    | 6 +++---
 .../MyCompanyName.MyProjectName.Blazor.csproj               | 4 ++--
 .../MyCompanyName.MyProjectName.Blazor.Host.csproj          | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/framework/src/Volo.Abp.BlazoriseUI/Volo.Abp.BlazoriseUI.csproj b/framework/src/Volo.Abp.BlazoriseUI/Volo.Abp.BlazoriseUI.csproj
index d275729d40..bd69ecdf35 100644
--- a/framework/src/Volo.Abp.BlazoriseUI/Volo.Abp.BlazoriseUI.csproj
+++ b/framework/src/Volo.Abp.BlazoriseUI/Volo.Abp.BlazoriseUI.csproj
@@ -12,9 +12,9 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Blazorise" Version="0.9.2-rc3" />
-        <PackageReference Include="Blazorise.DataGrid" Version="0.9.2-rc3" />
-        <PackageReference Include="Blazorise.Snackbar" Version="0.9.2-rc3" />
+        <PackageReference Include="Blazorise" Version="0.9.2-rc4" />
+        <PackageReference Include="Blazorise.DataGrid" Version="0.9.2-rc4" />
+        <PackageReference Include="Blazorise.Snackbar" Version="0.9.2-rc4" />
     </ItemGroup>
 
 </Project>
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj
index b292f22a0b..56c9a2cb8a 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Blazorise.Bootstrap" Version="0.9.2-rc3" />
-    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.2-rc3" />
+    <PackageReference Include="Blazorise.Bootstrap" Version="0.9.2-rc4" />
+    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.2-rc4" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.0" />
   </ItemGroup>
diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/MyCompanyName.MyProjectName.Blazor.Host.csproj b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/MyCompanyName.MyProjectName.Blazor.Host.csproj
index 936ca98a8f..d3f461c8c6 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/MyCompanyName.MyProjectName.Blazor.Host.csproj
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/MyCompanyName.MyProjectName.Blazor.Host.csproj
@@ -8,8 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Blazorise.Bootstrap" Version="0.9.2-rc3" />
-    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.2-rc3" />
+    <PackageReference Include="Blazorise.Bootstrap" Version="0.9.2-rc4" />
+    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.2-rc4" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly"  Version="5.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.0" />
   </ItemGroup>

From e991b1134389a108b557b43830ddeecd6e695fde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Wed, 11 Nov 2020 14:05:44 +0300
Subject: [PATCH 4/4] Fix vue package and publish 3.3.2.

---
 npm/packs/vee-validate/package.json  | 4 ++--
 npm/packs/vue/abp.resourcemapping.js | 2 +-
 npm/packs/vue/package.json           | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/npm/packs/vee-validate/package.json b/npm/packs/vee-validate/package.json
index d08ee8968f..9952e9276b 100644
--- a/npm/packs/vee-validate/package.json
+++ b/npm/packs/vee-validate/package.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.3.1",
+  "version": "3.3.2",
   "name": "@abp/vee-validate",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/vue": "~3.3.1",
+    "@abp/vue": "~3.3.2",
     "vee-validate": "~3.4.4"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/vue/abp.resourcemapping.js b/npm/packs/vue/abp.resourcemapping.js
index b249ba7bc6..7a607786a4 100644
--- a/npm/packs/vue/abp.resourcemapping.js
+++ b/npm/packs/vue/abp.resourcemapping.js
@@ -1,5 +1,5 @@
 module.exports = {
     mappings: {
-        "@node_modules/vue/dist/vue.global.prod.js": "@libs/vue/"
+        "@node_modules/vue/dist/vue.min.js": "@libs/vue/"
     }
 }
\ No newline at end of file
diff --git a/npm/packs/vue/package.json b/npm/packs/vue/package.json
index bc1b173d3f..d6e193363b 100644
--- a/npm/packs/vue/package.json
+++ b/npm/packs/vue/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "3.3.1",
+  "version": "3.3.2",
   "name": "@abp/vue",
   "publishConfig": {
     "access": "public"