Merge branch 'release/CsvOutputSTATS03'

2021-09-30 19:01:39 +02:00
parent f9f3dd56bd 027a0b4b4c
commit c297416f6c
7 changed files with 13 additions and 6 deletions
@@ -346,3 +346,4 @@ Backup*/
 UpgradeLog*.XML

 MP.Prog/Shared/MainLayout.razor
+MP.Stats/temp/*.csv
@@ -50,7 +50,7 @@
                    }
                    else
                    {
-                        <a target="_blank" href="/Download?fileName=@fileName" class="btn btn-block btn-sm btn-success"><span class="oi oi-cloud-download"></span> Download Data</a>
+                        <a target="_blank" href="Download?fileName=@fileName" class="btn btn-block btn-sm btn-success"><span class="oi oi-cloud-download"></span> Download Data</a>
                    }
                }
            </div>
@@ -4,7 +4,7 @@
        <TargetFramework>net5.0</TargetFramework>
        <RootNamespace>MP.Stats</RootNamespace>
        <UserSecretsId>826e877c-ba70-4253-84cb-d0b1cafd4440</UserSecretsId>
-        <Version>6.14.2109.3018</Version>
+        <Version>6.14.2109.3019</Version>
    </PropertyGroup>

    <ItemGroup>
@@ -43,6 +43,12 @@
      <PackageReference Include="NLog.Web.AspNetCore" Version="4.14.0" />
    </ItemGroup>

+    <ItemGroup>
+      <Content Update="wwwroot\favicon.ico">
+        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      </Content>
+    </ItemGroup>
+
    <ItemGroup>
        <None Update="logs\.placeholder">
            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -40,7 +40,7 @@ namespace MP.Stats.Pages
            {
                fileName = Request.Query["fileName"];
            }
-            var filePath = Path.Combine(_env.ContentRootPath, fileName);
+            var filePath = Path.Combine(_env.ContentRootPath, "temp\\", fileName);
            //var filePath = Path.Combine(_env.WebRootPath, "..\\temp\\", fileName);

            byte[] fileBytes = System.IO.File.ReadAllBytes(filePath);
@@ -1,6 +1,6 @@
 <body>
    <i>Modulo statistiche MAPO</i>
-    <h4>Versione: 6.14.2109.3018</h4>
+    <h4>Versione: 6.14.2109.3019</h4>
    <br />
    Note di rilascio:
    <ul>
@@ -1 +1 @@
-6.14.2109.3018
+6.14.2109.3019
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.14.2109.3018</version>
+  <version>6.14.2109.3019</version>
  <url>https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/MP.Stats.zip</url>
  <changelog>https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/ChangeLog.html</changelog>
  <mandatory>false</mandatory>