From bd806637c6e8f57d122d8a5eeea145b8ade97cba Mon Sep 17 00:00:00 2001
From: Luckz <224748+Luckz@users.noreply.github.com>
Date: Tue, 28 May 2019 17:08:16 +0200
Subject: [PATCH] Package update to fix and change to VS 2019 build (hopefully
still works in VS 2017); build as 64-bit
---
ASFui.sln | 19 +-
ASFui/ASFui.csproj | 48 +-
ASFui/FodyWeavers.xml | 5 +-
ASFui/NLog.xsd | 1382 +++++++++++++----
ASFui/packages.config | 14 +-
appveyor.yml | 4 +-
.../Fody.1.29.4/build/dotnet/Fody.targets | 92 --
.../portable-net+sl+win+wpa+wp/Fody.targets | 92 --
packages/Fody.4.2.1/build/Fody.targets | 106 ++
9 files changed, 1233 insertions(+), 529 deletions(-)
delete mode 100644 packages/Fody.1.29.4/build/dotnet/Fody.targets
delete mode 100644 packages/Fody.1.29.4/build/portable-net+sl+win+wpa+wp/Fody.targets
create mode 100644 packages/Fody.4.2.1/build/Fody.targets
diff --git a/ASFui.sln b/ASFui.sln
index 556e1ac..20245d9 100644
--- a/ASFui.sln
+++ b/ASFui.sln
@@ -1,22 +1,25 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28922.388
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ASFui", "ASFui\ASFui.csproj", "{B544FAA8-679B-45AD-8EC8-5182F9807797}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Release|Any CPU = Release|Any CPU
+ Debug|x64 = Debug|x64
+ Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {B544FAA8-679B-45AD-8EC8-5182F9807797}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {B544FAA8-679B-45AD-8EC8-5182F9807797}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {B544FAA8-679B-45AD-8EC8-5182F9807797}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {B544FAA8-679B-45AD-8EC8-5182F9807797}.Release|Any CPU.Build.0 = Release|Any CPU
+ {B544FAA8-679B-45AD-8EC8-5182F9807797}.Debug|x64.ActiveCfg = Debug|x64
+ {B544FAA8-679B-45AD-8EC8-5182F9807797}.Debug|x64.Build.0 = Debug|x64
+ {B544FAA8-679B-45AD-8EC8-5182F9807797}.Release|x64.ActiveCfg = Release|x64
+ {B544FAA8-679B-45AD-8EC8-5182F9807797}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {57286686-FECA-4251-8DD4-0CCCFF7FA4DB}
+ EndGlobalSection
EndGlobal
diff --git a/ASFui/ASFui.csproj b/ASFui/ASFui.csproj
index 7266daa..ebe773f 100644
--- a/ASFui/ASFui.csproj
+++ b/ASFui/ASFui.csproj
@@ -1,9 +1,11 @@
+
+
Debug
- AnyCPU
+ x64
{B544FAA8-679B-45AD-8EC8-5182F9807797}
WinExe
Properties
@@ -16,7 +18,7 @@
- publicar\
+ publish\
true
Disk
false
@@ -31,8 +33,8 @@
false
true
-
- AnyCPU
+
+ x64
true
full
false
@@ -43,8 +45,8 @@
false
false
-
- AnyCPU
+
+ x64
none
true
bin\Release\
@@ -52,6 +54,7 @@
prompt
4
false
+ false
ASFui.Program
@@ -78,18 +81,23 @@
app.manifest
+
+ ..\packages\Costura.Fody.3.3.3\lib\net40\Costura.dll
+
-
- ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll
- True
+
+ ..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll
- ..\packages\NLog.4.4.1\lib\net45\NLog.dll
- True
+ ..\packages\NLog.4.6.3\lib\net45\NLog.dll
+
+
+
+
@@ -155,7 +163,7 @@
- Always
+ PreserveNewest
Designer
@@ -187,13 +195,6 @@
-
-
-
- Este proyecto hace referencia a los paquetes NuGet que faltan en este equipo. Use la restauración de paquetes NuGet para descargarlos. Para obtener más información, consulte http://go.microsoft.com/fwlink/?LinkID=322105. El archivo que falta es {0}.
-
-
-
@@ -205,6 +206,15 @@
copy "$(TargetDir)$(TargetName).exe" "$(SolutionDir)out\$(TargetName).exe"
+
+
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
+
+
+
+
+
+
-
-
-
-
-
\ No newline at end of file
diff --git a/packages/Fody.1.29.4/build/portable-net+sl+win+wpa+wp/Fody.targets b/packages/Fody.1.29.4/build/portable-net+sl+win+wpa+wp/Fody.targets
deleted file mode 100644
index 2499a3f..0000000
--- a/packages/Fody.1.29.4/build/portable-net+sl+win+wpa+wp/Fody.targets
+++ /dev/null
@@ -1,92 +0,0 @@
-
-
-
-
-
- $(NCrunchOriginalSolutionDir)
-
-
-
-
- $(SolutionDir)
-
-
-
-
- $(MSBuildProjectDirectory)..\..\..\
-
-
-
-
-
-
- $(KeyOriginatorFile)
-
-
-
-
- $(AssemblyOriginatorKeyFile)
-
-
-
-
-
-
-
-
-
- $(ProjectDir)$(IntermediateOutputPath)
- $(SignAssembly)
- $(MSBuildThisFileDirectory)..\..\
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/packages/Fody.4.2.1/build/Fody.targets b/packages/Fody.4.2.1/build/Fody.targets
new file mode 100644
index 0000000..1007fb7
--- /dev/null
+++ b/packages/Fody.4.2.1/build/Fody.targets
@@ -0,0 +1,106 @@
+
+
+
+ $(ProjectDir)FodyWeavers.xml
+ $(MSBuildThisFileDirectory)..\
+ $(FodyPath)netstandardtask
+ $(FodyPath)netclassictask
+ $(FodyAssemblyDirectory)\Fody.dll
+ $(DefaultItemExcludes);FodyWeavers.xsd
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+