Pārlūkot izejas kodu

fix release broken: vs2022 preview update

HOME 2 gadi atpakaļ
vecāks
revīzija
7ed4d85add

+ 3 - 7
FNZCM/FNZCM.BlazorWasm/FNZCM.BlazorWasm.csproj

@@ -4,15 +4,11 @@
     <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
-
-  <ItemGroup>
-    <_WebToolingArtifacts Remove="Properties\PublishProfiles\Release.pubxml" />
-  </ItemGroup>
- 
+  
   <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.0-rc.1.22427.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.0-rc.1.22427.2" PrivateAssets="all" />
     <PackageReference Include="Blazored.LocalStorage" Version="4.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.0-preview.4.22251.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.0-preview.4.22251.1" PrivateAssets="all" />
     <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />

+ 16 - 18
FNZCM/FNZCM.BlazorWasm/Properties/launchSettings.json

@@ -1,23 +1,29 @@
 {
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:4820",
+      "sslPort": 0
+    }
+  },
   "profiles": {
-    "FNZCM.BlazorWasm": {
+    "http": {
       "commandName": "Project",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      },
       "dotnetRunMessages": true,
+      "launchBrowser": false,
       "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
-      "applicationUrl": "http://localhost:57625"
+      "applicationUrl": "http://localhost:57625",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
     },
     "IIS Express": {
       "commandName": "IISExpress",
+      "launchBrowser": false,
+      "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
-      "dotnet": {
-        "commandName": "Project",
-        "hotReloadProfile": "aspnetcore"
       }
     },
     "HotLoad": {
@@ -29,13 +35,5 @@
         "DOTNET_WATCH_SUPPRESS_LAUNCH_BROWSER": "1"
       }
     }
-  },
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:5263",
-      "sslPort": 0
-    }
   }
 }

+ 4 - 1
FNZCM/FNZCM.ConHost/HostProgram.cs

@@ -419,14 +419,17 @@ namespace FNZCM.ConHost
                         void Output(byte[] bin)
                         {
                             if (entPath.ToLower().EndsWith(".js")) context.Response.ContentType = "application/javascript";
+                            else if (entPath.ToLower().EndsWith(".wasm")) context.Response.ContentType = "application/wasm";
+                            else if (entPath.ToLower().EndsWith(".css")) context.Response.ContentType = "text/css";
                             else if (module.HtmlBaseReplace != null && entPath.ToLower().EndsWith(".html"))
                             {
                                 //base replace
                                 var html = Encoding.UTF8.GetString(bin);
                                 var r = html.Replace(module.HtmlBaseReplace, $"<base href=\"/modules/{moduleKey}/\" />");
                                 bin = Encoding.UTF8.GetBytes(r);
-                            }
+                            }else context.Response.ContentType = "application/octet-stream";
 
+                            context.Response.ContentLength64 = bin.Length;
                             context.Response.OutputStream.Write(bin, 0, bin.Length);
                         }
 

+ 0 - 1
FNZCM/FNZCM.Core/ConfigFile.cs

@@ -29,7 +29,6 @@ namespace FNZCM.Core
 
         public static void Reload() => Instance = JsonConvert.DeserializeObject<ConfigFile>(File.ReadAllText(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "config.json")));
 
-
         public string ListenPrefix { get; set; }
         public IReadOnlyCollection<string> AliasPrefix { get; set; }
         public IReadOnlyCollection<string> AccessControlAllowOrigin { get; set; }

+ 1 - 1
FNZCM/FNZCM.Shared/FNZCM.Shared.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>

+ 6 - 6
FNZCM/FNZCM.sln

@@ -15,10 +15,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FNZCM.Core", "FNZCM.Core\FN
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FNZCM.LyricTools", "FNZCM.LyricTools\FNZCM.LyricTools.csproj", "{D2FB3072-B708-446A-A393-3D9F0306D210}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FNZCM.BlazorWasm", "FNZCM.BlazorWasm\FNZCM.BlazorWasm.csproj", "{CE63EFD6-E86F-43F3-AF70-3A4066AFC37D}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FNZCM.Shared", "FNZCM.Shared\FNZCM.Shared.csproj", "{1E0B8152-0310-4EA1-8271-211F1E41C778}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FNZCM.BlazorWasm", "FNZCM.BlazorWasm\FNZCM.BlazorWasm.csproj", "{6610DBEA-B1FC-44E2-AC16-4E482C19E251}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -37,14 +37,14 @@ Global
 		{D2FB3072-B708-446A-A393-3D9F0306D210}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D2FB3072-B708-446A-A393-3D9F0306D210}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D2FB3072-B708-446A-A393-3D9F0306D210}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CE63EFD6-E86F-43F3-AF70-3A4066AFC37D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CE63EFD6-E86F-43F3-AF70-3A4066AFC37D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CE63EFD6-E86F-43F3-AF70-3A4066AFC37D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CE63EFD6-E86F-43F3-AF70-3A4066AFC37D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1E0B8152-0310-4EA1-8271-211F1E41C778}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1E0B8152-0310-4EA1-8271-211F1E41C778}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1E0B8152-0310-4EA1-8271-211F1E41C778}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1E0B8152-0310-4EA1-8271-211F1E41C778}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6610DBEA-B1FC-44E2-AC16-4E482C19E251}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6610DBEA-B1FC-44E2-AC16-4E482C19E251}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6610DBEA-B1FC-44E2-AC16-4E482C19E251}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6610DBEA-B1FC-44E2-AC16-4E482C19E251}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE