From 95380c5c48920b22b4e24805e63f58cf3e43a3d6 Mon Sep 17 00:00:00 2001 From: Kagamia Date: Fri, 27 Dec 2024 16:29:51 +0800 Subject: [PATCH] Add net8-windows target. (#300) * Add net8-windows target. * Publish net8 artifact mirror. --- Build/Common.props | 19 +++++++++--- CharaSimResource | 2 +- References/IMEHelper.dll | Bin 23552 -> 23552 bytes .../WzComparerR2.Avatar.csproj | 4 +-- .../Effect/PngEffect.3.8.2.1105.mgfxo | Bin 0 -> 1754 bytes .../WzComparerR2.Common.csproj | 2 +- .../WzComparerR2.LuaConsole.csproj | 2 +- WzComparerR2.MapRender/FrmMapRender2.cs | 9 ++---- .../WzComparerR2.MapRender.csproj | 4 +-- .../WzComparerR2.Network.csproj | 2 +- .../WzComparerR2.PluginBase.csproj | 2 +- WzComparerR2.WzLib/WzComparerR2.WzLib.csproj | 4 +-- WzComparerR2/WzComparerR2.csproj | 7 +++-- azure-pipelines.yml | 29 ++++++++++++++++-- 14 files changed, 59 insertions(+), 27 deletions(-) create mode 100644 WzComparerR2.Common/Rendering/Effect/PngEffect.3.8.2.1105.mgfxo diff --git a/Build/Common.props b/Build/Common.props index 5a5a253c..4feadde3 100644 --- a/Build/Common.props +++ b/Build/Common.props @@ -13,13 +13,23 @@ false false - - - + + + + disable + CA1416 + core + 3.8.2.1105 + 8.0.11 + + + + disable CA1416 core 3.8.1.303 + 6.0.0 @@ -29,9 +39,10 @@ 3.8.0.1641 - + 4.2.0 + 8.0.0 diff --git a/CharaSimResource b/CharaSimResource index 3ef9946c..8fe4dd2a 160000 --- a/CharaSimResource +++ b/CharaSimResource @@ -1 +1 @@ -Subproject commit 3ef9946c71c878a6eaee5cd026159f7fe5c74195 +Subproject commit 8fe4dd2aa6af9e093a3829b6ad57edfc3e4a1d19 diff --git a/References/IMEHelper.dll b/References/IMEHelper.dll index f0fbe4e97af2c835e4b9487ffb5cc1163acadd4a..dcaa115531d496c1128c068d542fff16daf4f4e0 100644 GIT binary patch delta 10500 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 diff --git a/WzComparerR2.Avatar/WzComparerR2.Avatar.csproj b/WzComparerR2.Avatar/WzComparerR2.Avatar.csproj index 49519555..7b938f80 100644 --- a/WzComparerR2.Avatar/WzComparerR2.Avatar.csproj +++ b/WzComparerR2.Avatar/WzComparerR2.Avatar.csproj @@ -1,6 +1,6 @@  - net462;net6.0-windows + net462;net6.0-windows;net8.0-windows true WzComparerR2.Avatar WzComparerR2.Avatar @@ -47,7 +47,7 @@ ..\References\DevComponents.DotNetBar2.dll false - + diff --git a/WzComparerR2.Common/Rendering/Effect/PngEffect.3.8.2.1105.mgfxo b/WzComparerR2.Common/Rendering/Effect/PngEffect.3.8.2.1105.mgfxo new file mode 100644 index 0000000000000000000000000000000000000000..ddcde78bc567b4f894ff807a95de0005f1cdbf90 GIT binary patch literal 1754 zcmdT_ziU%b6h1dEZC(Ryf;b3LeM5&19cn558cfo(uNAE6uShC_wl$hSY(g5Lh{&Vh z;35tp1(&xMp-Np`T>S$a6r4%~7eP7*(&71i_r6zZ#K}QCaPq$UopZl)?|bL8)01u~ zsrDZ>UMYb&65~S~iL_b213O+C%P;P}_&PS_^xvA@`LWr%|C%X`#qk`59|hrH{S=<7 zub%q^jxMnv*ui6vSpO0YijskFjR$gOMY=>%zKE9rb6_VC#lk~uJHkq=2tN@!<&TM2 zhl~3bxb}88bd@N^J;szI$U{TClD<{~IG|?4$52b- zAP||K8lOWE$qMcZze@cZX&{l(F^NmV;9^l^IW5*+IxR@ocm$Z2Dr3){WAZ9E54j1E zo;|#Lnj7Z156n8!KP!?r$mt7nPZ<4v#ExJ;YpE<%yv+GfuMe@^FxK5;_I*#8=NZ&( zItF)#InNSC$Bh~OG``VBm=kGUK$(m4lb36#gcmF}d z6T)1>=^WqiZ4bJTvY}V>HSU;zQIJ^?nT9Vy(|zm!nRomzCIZJ1w__qkM3S5c8oJiY zX#^Zjq{@=;GR%u6z};|2YU4D}I0e+lgxQf^(sLNnJST$jUWr@DaL?h1iR%1^6N776 zyrq@AQ(Z6L%-3u6Ca*0DP4fq{dRA)HMy}SVEa?pN;UTjUiG}id>uwW&1Aj42OjoPC YQW++FuqS|pc{+OPw`iC;jsI#t0Z7l=4*&oF literal 0 HcmV?d00001 diff --git a/WzComparerR2.Common/WzComparerR2.Common.csproj b/WzComparerR2.Common/WzComparerR2.Common.csproj index c5c42a63..43e0281b 100644 --- a/WzComparerR2.Common/WzComparerR2.Common.csproj +++ b/WzComparerR2.Common/WzComparerR2.Common.csproj @@ -1,6 +1,6 @@  - net462;net6.0-windows + net462;net6.0-windows;net8.0-windows true WzComparerR2.Common WzComparerR2 diff --git a/WzComparerR2.LuaConsole/WzComparerR2.LuaConsole.csproj b/WzComparerR2.LuaConsole/WzComparerR2.LuaConsole.csproj index fd596f1e..7544dc8e 100644 --- a/WzComparerR2.LuaConsole/WzComparerR2.LuaConsole.csproj +++ b/WzComparerR2.LuaConsole/WzComparerR2.LuaConsole.csproj @@ -1,6 +1,6 @@  - net462;net6.0-windows + net462;net6.0-windows;net8.0-windows true WzComparerR2.LuaConsole WzComparerR2.LuaConsole diff --git a/WzComparerR2.MapRender/FrmMapRender2.cs b/WzComparerR2.MapRender/FrmMapRender2.cs index 0e7547c9..de75a6c7 100644 --- a/WzComparerR2.MapRender/FrmMapRender2.cs +++ b/WzComparerR2.MapRender/FrmMapRender2.cs @@ -39,6 +39,7 @@ public FrmMapRender2() this.TargetElapsedTime = TimeSpan.FromSeconds(1.0 / 60); this.InactiveSleepTime = TimeSpan.FromSeconds(1.0 / 30); this.IsMouseVisible = true; + this.Exiting += (o, e) => this.OnExiting(); this.Content = new WcR2ContentManager(this.Services); this.patchVisibility = new PatchVisibility(); @@ -55,6 +56,8 @@ public FrmMapRender2() form.FormClosed += Form_FormClosed; this.imeHelper = new IMEHandler(this, true); + this.Exiting += (o, e) => this.imeHelper.Dispose(); + this.Disposed += (o, e) => this.imeHelper.Dispose(); GameExt.FixKeyboard(this); } @@ -1129,12 +1132,6 @@ protected override void UnloadContent() } } - protected override void OnExiting(object sender, EventArgs args) - { - base.OnExiting(sender, args); - this.OnExiting(); - } - private void OnExiting() { if (this.isExiting) diff --git a/WzComparerR2.MapRender/WzComparerR2.MapRender.csproj b/WzComparerR2.MapRender/WzComparerR2.MapRender.csproj index acbfd185..dbe5f190 100644 --- a/WzComparerR2.MapRender/WzComparerR2.MapRender.csproj +++ b/WzComparerR2.MapRender/WzComparerR2.MapRender.csproj @@ -1,6 +1,6 @@  - net462;net6.0-windows + net462;net6.0-windows;net8.0-windows true WzComparerR2.MapRender WzComparerR2.MapRender @@ -66,7 +66,7 @@ - + diff --git a/WzComparerR2.Network/WzComparerR2.Network.csproj b/WzComparerR2.Network/WzComparerR2.Network.csproj index 1842b602..7ea4b022 100644 --- a/WzComparerR2.Network/WzComparerR2.Network.csproj +++ b/WzComparerR2.Network/WzComparerR2.Network.csproj @@ -1,6 +1,6 @@  - net462;net6.0-windows + net462;net6.0-windows;net8.0-windows true WzComparerR2.Network WzComparerR2.Network diff --git a/WzComparerR2.PluginBase/WzComparerR2.PluginBase.csproj b/WzComparerR2.PluginBase/WzComparerR2.PluginBase.csproj index 056b2ebd..8d186e7d 100644 --- a/WzComparerR2.PluginBase/WzComparerR2.PluginBase.csproj +++ b/WzComparerR2.PluginBase/WzComparerR2.PluginBase.csproj @@ -1,6 +1,6 @@  - net462;net6.0-windows + net462;net6.0-windows;net8.0-windows true WzComparerR2.PluginBase WzComparerR2.PluginBase diff --git a/WzComparerR2.WzLib/WzComparerR2.WzLib.csproj b/WzComparerR2.WzLib/WzComparerR2.WzLib.csproj index 07465492..4b56f1eb 100644 --- a/WzComparerR2.WzLib/WzComparerR2.WzLib.csproj +++ b/WzComparerR2.WzLib/WzComparerR2.WzLib.csproj @@ -1,6 +1,6 @@  - net462;net6.0 + net462;net6.0;net8.0 WzComparerR2.WzLib WzComparerR2.WzLib false @@ -15,7 +15,7 @@ - + diff --git a/WzComparerR2/WzComparerR2.csproj b/WzComparerR2/WzComparerR2.csproj index 55a72581..43b50bf8 100644 --- a/WzComparerR2/WzComparerR2.csproj +++ b/WzComparerR2/WzComparerR2.csproj @@ -1,7 +1,7 @@  WinExe - net462;net6.0-windows + net462;net6.0-windows;net8.0-windows true WzComparerR2 WzComparerR2 @@ -20,7 +20,8 @@ - + + @@ -44,7 +45,7 @@ - + diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b44825d5..c88e659f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -17,8 +17,10 @@ variables: outputDir_netfx_anycpu: 'WzComparerR2/bin/release/net462' outputDir_netfx_x86: 'WzComparerR2/bin/x86/release/net462' outputDir_net6_anycpu: 'WzComparerR2/bin/release/net6.0-windows' + outputDir_net8_anycpu: 'WzComparerR2/bin/release/net8.0-windows' outputFileName_netfx: 'WcR2_With_Plugins_$(Build.BuildNumber)' outputFileName_net6: 'WcR2_With_Plugins_net6_$(Build.BuildNumber)' + outputFileName_net8: 'WcR2_With_Plugins_net8_$(Build.BuildNumber)' isMain: $[eq(variables['Build.SourceBranch'], 'refs/heads/master')] accountName: 'wcr2publish' containerName: 'ci-build' @@ -70,6 +72,10 @@ steps: move "$(outputDir_net6_anycpu)\*.dll" "$(outputDir_net6_anycpu)\Lib" del "$(outputDir_net6_anycpu)\*.pdb" move "$(outputDir_net6_anycpu)\Lib\WzComparerR2.dll" "$(outputDir_net6_anycpu)" + + move "$(outputDir_net8_anycpu)\*.dll" "$(outputDir_net8_anycpu)\Lib" + del "$(outputDir_net8_anycpu)\*.pdb" + move "$(outputDir_net8_anycpu)\Lib\WzComparerR2.dll" "$(outputDir_net8_anycpu)" failOnStderr: true - task: ArchiveFiles@2 @@ -90,6 +96,15 @@ steps: archiveFile: '$(Build.ArtifactStagingDirectory)/$(outputFileName_net6).zip' replaceExistingArchive: true +- task: ArchiveFiles@2 + displayName: Compress net8 release + inputs: + rootFolderOrFile: '$(outputDir_net8_anycpu)' + includeRootFolder: false + archiveType: 'zip' + archiveFile: '$(Build.ArtifactStagingDirectory)/$(outputFileName_net8).zip' + replaceExistingArchive: true + - task: AzureCLI@2 displayName: Upload to blob inputs: @@ -106,11 +121,19 @@ steps: "srcFile"="$(outputFileName_net6).zip" "outputVariableName"="sasurl_net6" } + @{ + "srcFile"="$(outputFileName_net8).zip" + "outputVariableName"="sasurl_net8" + } ) - $expireDate = (Get-Date).ToUniversalTime().AddYears(1).ToString("yyyy-MM-dd'T'HH:mm:ss'Z'") + $time = (Get-Date).ToUniversalTime() + $expireDate = $time.AddYears(1).ToString("yyyy-MM-dd'T'HH:mm:ss'Z'") $keys = ConvertFrom-Json ((az storage account keys list --account-name $(accountName)) -join "") $accountKey = $keys[0].value + $commitID = "$(Build.SourceVersion)" + $buildID = "$(Build.BuildNumber)" + $uploadTime = $time.ToString("yyyy-MM-dd'T'HH:mm:ss'Z'") foreach ($f in $files) { $srcFile = "$(Build.ArtifactStagingDirectory)/{0}" -f $f.srcFile @@ -118,7 +141,7 @@ steps: $varName = $f.outputVariableName Write-Host "Uploading ${srcFile} ..." - az storage blob upload --auth-mode login --account-name $(accountName) --container-name $(containerName) --name $dstFile --file $srcFile + az storage blob upload --auth-mode login --account-name $(accountName) --container-name $(containerName) --name $dstFile --file $srcFile --tags "commitID=$commitID" "buildID=$buildID" "uploadTime=$uploadTime" Write-Host "Generate sas url..." $url = ConvertFrom-Json (az storage blob url --auth-mode login --account-name $(accountName) --container-name $(containerName) --name $dstFile) @@ -158,6 +181,6 @@ steps: releaseNotesSource: 'inline' releaseNotesInline: | Automation build from azure-pipeline. - Mirror: [[WcR2.netfx.zip]($(sasurl_netfx))] | [[WcR2.net6.zip]($(sasurl_net6))] + Mirror: [[WcR2.netfx.zip]($(sasurl_netfx))] | [[WcR2.net6.zip]($(sasurl_net6))] | [[WcR2.net8.zip]($(sasurl_net8))] isPreRelease: false addChangeLog: false