tsai
/
abp
mirror of https://github.com/abpframework/abp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge branch 'dev' of https://github.com/volosoft/abp into dev

pull/6159/head
Yunus Emre Kalkan 6 years ago
parent
7be76b4881 e991b11343
commit
61bb7b1d34
7 changed files with 13 additions and 13 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Vue/VueScriptContributor.cs
  2. 6
      framework/src/Volo.Abp.BlazoriseUI/Volo.Abp.BlazoriseUI.csproj
  3. 4
      npm/packs/vee-validate/package.json
  4. 2
      npm/packs/vue/abp.resourcemapping.js
  5. 4
      npm/packs/vue/package.json
  6. 4
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj
  7. 4
      templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/MyCompanyName.MyProjectName.Blazor.Host.csproj

2
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Vue/VueScriptContributor.cs
View File

@ -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");
}
}
}

6
framework/src/Volo.Abp.BlazoriseUI/Volo.Abp.BlazoriseUI.csproj
View File

@ -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>

4
npm/packs/vee-validate/package.json
View File

@ -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"

2
npm/packs/vue/abp.resourcemapping.js
View File

@ -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/"
}
}

4
npm/packs/vue/package.json
View File

@ -1,11 +1,11 @@
{
"version": "3.3.1",
"version": "3.3.2",
"name": "@abp/vue",
"publishConfig": {
"access": "public"
},
"dependencies": {
"vue": "~3.0.2"
"vue": "~2.6.12"
},
"gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
}

4
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj
View File

@ -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>

4
templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/MyCompanyName.MyProjectName.Blazor.Host.csproj
View File

@ -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>

Write Preview
Loading…
Cancel
Save