Merge pull request #10305 from abpframework/liangshiwei/net6-rc2

Upgrade to .NET 6.0 RC.2

.github/workflows/build-and-test.yml

@@ -21,7 +21,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-dotnet@master
       with:
-        dotnet-version: 6.0.100-rc.1.21458.32
+        dotnet-version: 6.0.100-rc.2.21505.57
 
     - name: Build All
       run: .\build-all.ps1

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Bundling/BundlerBase.cs

@@ -41,7 +41,7 @@ namespace Volo.Abp.Cli.Bundling
             return GenerateDefinition(bundleFilePath,fileDefinitionsExcludingFromBundle);
         }
 
-        private bool IsMinFile(string fileName)
+        private bool IsMinFile(string fileName, string content)
         {
             foreach (var suffix in _minFileSuffixes)
             {
@@ -51,6 +51,11 @@ namespace Volo.Abp.Cli.Bundling
                 }
             }
 
+            if (content.SplitToLines().Length < 10)
+            {
+                return true;
+            }
+
             return false;
         }
 
@@ -117,7 +122,7 @@ namespace Volo.Abp.Cli.Bundling
         private string GetFileContent(string filePath, bool minify)
         {
             var content = File.ReadAllText(filePath);
-            if (minify && !IsMinFile(filePath))
+            if (minify && !IsMinFile(filePath, content))
             {
                 try
                 {

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.100-rc.1.21458.32",
+    "version": "6.0.100-rc.2.21505.57",
     "rollForward": "latestFeature"
   }
 }