Upgrade to .NET 4.7.2.
This commit is contained in:
Nick Blakely
parent
f64383825a
commit
ff7df4960a
|
|
@ -0,0 +1,127 @@
|
|||
!macro CheckNetFramework FrameworkVersion
|
||||
Var /GLOBAL dotNetUrl${FrameworkVersion}
|
||||
Var /GLOBAL dotNetReadableVersion${FrameworkVersion}
|
||||
|
||||
!ifndef DOTNET472_URL
|
||||
!define DOTNET472_URL "https://go.microsoft.com/fwlink/?LinkId=863265"
|
||||
!define DOTNET471_URL "https://go.microsoft.com/fwlink/?LinkId=852104"
|
||||
!define DOTNET47_URL "https://go.microsoft.com/fwlink/?LinkId=825302"
|
||||
!define DOTNET462_URL "https://go.microsoft.com/fwlink/?LinkId=780600"
|
||||
!define DOTNET461_URL "https://go.microsoft.com/fwlink/?LinkId=671743"
|
||||
!define DOTNET46_URL "https://go.microsoft.com/fwlink/?LinkId=528232"
|
||||
!define DOTNET452_URL "https://go.microsoft.com/fwlink/?LinkId=397708"
|
||||
!define DOTNET451_URL "https://go.microsoft.com/fwlink/?LinkId=322116"
|
||||
!define DOTNET45_URL "https://go.microsoft.com/fwlink/?LinkId=225702"
|
||||
!define DOTNET40Full_URL "https://www.microsoft.com/downloads/info.aspx?na=41&srcfamilyid=0a391abd-25c1-4fc0-919f-b21f31ab88b7&srcdisplaylang=en&u=http%3a%2f%2fdownload.microsoft.com%2fdownload%2f9%2f5%2fA%2f95A9616B-7A37-4AF6-BC36-D6EA96C8DAAE%2fdotNetFx40_Full_x86_x64.exe"
|
||||
!define DOTNET40Client_URL "https://www.microsoft.com/downloads/info.aspx?na=41&srcfamilyid=e5ad0459-cbcc-4b4f-97b6-fb17111cf544&srcdisplaylang=en&u=http%3a%2f%2fdownload.microsoft.com%2fdownload%2f5%2f6%2f2%2f562A10F9-C9F4-4313-A044-9C94E0A8FAC8%2fdotNetFx40_Client_x86_x64.exe"
|
||||
!define DOTNET35_URL "https://download.microsoft.com/download/2/0/e/20e90413-712f-438c-988e-fdaa79a8ac3d/dotnetfx35.exe"
|
||||
!define DOTNET30_URL "https://download.microsoft.com/download/2/0/e/20e90413-712f-438c-988e-fdaa79a8ac3d/dotnetfx35.exe"
|
||||
!define DOTNET20_URL "https://www.microsoft.com/downloads/info.aspx?na=41&srcfamilyid=0856eacb-4362-4b0d-8edd-aab15c5e04f5&srcdisplaylang=en&u=http%3a%2f%2fdownload.microsoft.com%2fdownload%2f5%2f6%2f7%2f567758a3-759e-473e-bf8f-52154438565a%2fdotnetfx.exe"
|
||||
!define DOTNET11_URL "https://www.microsoft.com/downloads/info.aspx?na=41&srcfamilyid=262d25e3-f589-4842-8157-034d1e7cf3a3&srcdisplaylang=en&u=http%3a%2f%2fdownload.microsoft.com%2fdownload%2fa%2fa%2fc%2faac39226-8825-44ce-90e3-bf8203e74006%2fdotnetfx.exe"
|
||||
!define DOTNET10_URL "https://www.microsoft.com/downloads/info.aspx?na=41&srcfamilyid=262d25e3-f589-4842-8157-034d1e7cf3a3&srcdisplaylang=en&u=http%3a%2f%2fdownload.microsoft.com%2fdownload%2fa%2fa%2fc%2faac39226-8825-44ce-90e3-bf8203e74006%2fdotnetfx.exe"
|
||||
!endif
|
||||
|
||||
${If} ${FrameworkVersion} == "472"
|
||||
StrCpy $dotNetUrl${FrameworkVersion} ${DOTNET472_URL}
|
||||
StrCpy $dotNetReadableVersion${FrameworkVersion} "4.7.2"
|
||||
${ElseIf} ${FrameworkVersion} == "471"
|
||||
StrCpy $dotNetUrl${FrameworkVersion} ${DOTNET471_URL}
|
||||
StrCpy $dotNetReadableVersion${FrameworkVersion} "4.7.1"
|
||||
${ElseIf} ${FrameworkVersion} == "47"
|
||||
StrCpy $dotNetUrl${FrameworkVersion} ${DOTNET47_URL}
|
||||
StrCpy $dotNetReadableVersion${FrameworkVersion} "4.7"
|
||||
${ElseIf} ${FrameworkVersion} == "462"
|
||||
StrCpy $dotNetUrl${FrameworkVersion} ${DOTNET462_URL}
|
||||
StrCpy $dotNetReadableVersion${FrameworkVersion} "4.6.2"
|
||||
${ElseIf} ${FrameworkVersion} == "461"
|
||||
StrCpy $dotNetUrl${FrameworkVersion} ${DOTNET461_URL}
|
||||
StrCpy $dotNetReadableVersion${FrameworkVersion} "4.6.1"
|
||||
${ElseIf} ${FrameworkVersion} == "46"
|
||||
StrCpy $dotNetUrl${FrameworkVersion} ${DOTNET46_URL}
|
||||
StrCpy $dotNetReadableVersion${FrameworkVersion} "4.6"
|
||||
${ElseIf} ${FrameworkVersion} == "452"
|
||||
StrCpy $dotNetUrl${FrameworkVersion} ${DOTNET452_URL}
|
||||
StrCpy $dotNetReadableVersion${FrameworkVersion} "4.52"
|
||||
${ElseIf} ${FrameworkVersion} == "451"
|
||||
StrCpy $dotNetUrl${FrameworkVersion} ${DOTNET451_URL}
|
||||
StrCpy $dotNetReadableVersion${FrameworkVersion} "4.51"
|
||||
${ElseIf} ${FrameworkVersion} == "45"
|
||||
StrCpy $dotNetUrl${FrameworkVersion} ${DOTNET45_URL}
|
||||
StrCpy $dotNetReadableVersion${FrameworkVersion} "4.5"
|
||||
${ElseIf} ${FrameworkVersion} == "40Full"
|
||||
StrCpy $dotNetUrl${FrameworkVersion} ${DOTNET40Full_URL}
|
||||
StrCpy $dotNetReadableVersion${FrameworkVersion} "4.0 Full"
|
||||
${ElseIf} ${FrameworkVersion} == "40Client"
|
||||
StrCpy $dotNetUrl${FrameworkVersion} ${DOTNET40Client_URL}
|
||||
StrCpy $dotNetReadableVersion${FrameworkVersion} "4.0 Client"
|
||||
${ElseIf} ${FrameworkVersion} == "35"
|
||||
StrCpy $dotNetUrl${FrameworkVersion} ${DOTNET35_URL}
|
||||
StrCpy $dotNetReadableVersion${FrameworkVersion} "3.5"
|
||||
${ElseIf} ${FrameworkVersion} == "30"
|
||||
StrCpy $dotNetUrl${FrameworkVersion} ${DOTNET30_URL}
|
||||
StrCpy $dotNetReadableVersion${FrameworkVersion} "3.0"
|
||||
${ElseIf} ${FrameworkVersion} == "20"
|
||||
StrCpy $dotNetUrl${FrameworkVersion} ${DOTNET20_URL}
|
||||
StrCpy $dotNetReadableVersion${FrameworkVersion} "2.0"
|
||||
${ElseIf} ${FrameworkVersion} == "11"
|
||||
StrCpy $dotNetUrl${FrameworkVersion} ${DOTNET11_URL}
|
||||
StrCpy $dotNetReadableVersion${FrameworkVersion} "1.1"
|
||||
${ElseIf} ${FrameworkVersion} == "10"
|
||||
StrCpy $dotNetUrl${FrameworkVersion} ${DOTNET10_URL}
|
||||
StrCpy $dotNetReadableVersion${FrameworkVersion} "1.0"
|
||||
${EndIf}
|
||||
|
||||
DetailPrint "Checking .NET Framework version..."
|
||||
|
||||
Push $0
|
||||
Push $1
|
||||
Push $2
|
||||
Push $3
|
||||
Push $4
|
||||
Push $5
|
||||
Push $6
|
||||
Push $7
|
||||
|
||||
DotNetChecker::IsDotNet${FrameworkVersion}Installed
|
||||
Pop $0
|
||||
|
||||
${If} $0 == "false"
|
||||
${OrIf} $0 == "f" ; if script is compiled in ANSI mode then we get only an "f" https://github.com/ReVolly/NsisDotNetChecker/issues/4
|
||||
DetailPrint ".NET Framework $dotNetReadableVersion${FrameworkVersion} not found, download is required for program to run."
|
||||
Goto NoDotNET${FrameworkVersion}
|
||||
${Else}
|
||||
DetailPrint ".NET Framework $dotNetReadableVersion${FrameworkVersion} found, no need to install."
|
||||
Goto NoDotNET${FrameworkVersion}
|
||||
${EndIf}
|
||||
|
||||
NoDotNET${FrameworkVersion}:
|
||||
MessageBox MB_YESNOCANCEL|MB_ICONEXCLAMATION \
|
||||
".NET Framework not installed. Required version: $dotNetReadableVersion${FrameworkVersion}.$\nInstall now?" \
|
||||
/SD IDYES IDYES InstallDotNET${FrameworkVersion} IDNO NewDotNET${FrameworkVersion}
|
||||
goto GiveUpDotNET${FrameworkVersion} ;IDCANCEL
|
||||
|
||||
InstallDotNET${FrameworkVersion}:
|
||||
DetailPrint "Starting Microsoft .NET Framework v${NETVersion} Setup..."
|
||||
ExecWait "$TEMP\${NETInstallerFileName}"
|
||||
|
||||
DetailPrint "Completed .NET Framework install/update. Removing .NET Framework installer."
|
||||
Delete "$TEMP\${NETInstallerFileName}"
|
||||
|
||||
DetailPrint ".NET Framework installer removed."
|
||||
goto NewDotNet${FrameworkVersion}
|
||||
|
||||
GiveUpDotNET${FrameworkVersion}:
|
||||
Abort "Installation canceled by user."
|
||||
|
||||
NewDotNET${FrameworkVersion}:
|
||||
DetailPrint "Proceeding with remainder of installation."
|
||||
Pop $7
|
||||
Pop $6
|
||||
Pop $5
|
||||
Pop $4
|
||||
Pop $3
|
||||
Pop $2
|
||||
Pop $1
|
||||
Pop $0
|
||||
|
||||
!macroend
|
||||
|
|
@ -1,17 +1,18 @@
|
|||
Unicode True
|
||||
SetCompressor /SOLID lzma
|
||||
|
||||
!define PRODUCT_NAME "Giants: Citizen Kabuto"
|
||||
!define PRODUCT_VERSION "1.498"
|
||||
|
||||
; MUI 1.67 compatible ------
|
||||
!include "MUI.nsh"
|
||||
!include "MUI2.nsh"
|
||||
!include "DotNetChecker.nsh"
|
||||
|
||||
; MUI Settings
|
||||
!define MUI_ABORTWARNING
|
||||
!define MUI_ICON "GPatch.ico"
|
||||
|
||||
; Welcome page
|
||||
;!insertmacro MUI_PAGE_WELCOME
|
||||
; Directory page
|
||||
!insertmacro MUI_PAGE_DIRECTORY
|
||||
; Instfiles page
|
||||
|
|
@ -36,13 +37,6 @@ SetCompressor /SOLID lzma
|
|||
; Language selection settings
|
||||
!define MUI_LANGDLL_WINDOWTITLE "Setup Language"
|
||||
|
||||
; Language strings
|
||||
LangString AskInstallGSA ${LANG_ENGLISH} "The GameSpy Arcade gaming service supports multiplayer matchmaking for Giants: Citizen Kabuto. Find buddies, download patches, and chat with new opponents online. Install GameSpy Arcade?"
|
||||
LangString AskInstallGSA ${LANG_FRENCH} "Le service de jeu GameSpy Arcade gère désormais les parties multijoueurs de Giants: Citizen Kabuto. Trouvez des amis, téléchargez des patchs et discustez avec de nouveaux adversaires en ligne. Installer GameSpy Arcade ?"
|
||||
LangString AskInstallGSA ${LANG_GERMAN} "Der 'GameSpy Arcade Gaming Service' unterstützt Multiplayer-Matchmaking für Giants: Citizen Kabuto. Finde Freunde, lade Patches herunter und chatte online mit neuen Gegnern. GameSpy Arcade installieren?"
|
||||
LangString AskInstallGSA ${LANG_SPANISH} "Ahora, el servicio de juegos de GameSpy Arcade acepta las partidas multijugador de Giants: Citizen Kabuto. Busca amigos, descarga parches y charla con nuevos rivales conectados. ¿Deseas instalar GameSpy Arcade?"
|
||||
LangString AskInstallGSA ${LANG_ITALIAN} "Il servizio giochi di GameSpy Arcade supporta l'abbinamento di più giocatori per Giants: Cittadino Kabuto. Trova amici, scarica le patch e chatta coi nuovi avversari online. Installare GameSpy Arcade?"
|
||||
|
||||
!include LogicLib.nsh
|
||||
|
||||
; MUI end ------
|
||||
|
|
@ -96,20 +90,22 @@ Section
|
|||
|
||||
SectionEnd
|
||||
|
||||
!define NETVersion "3.5"
|
||||
!define NETInstaller "dotnetfx35setup.exe"
|
||||
!define NETVersion "4.7.2"
|
||||
!define NETInstallerFileName "NDP472-KB4054531-Web.exe"
|
||||
!define NETInstallerPath "Files\Redist\NDP472-KB4054531-Web.exe"
|
||||
|
||||
Section "MS .NET Framework v${NETVersion}" SecFramework
|
||||
IfFileExists "$WINDIR\Microsoft.NET\Framework\v${NETVersion}" NETFrameworkInstalled 0
|
||||
File /oname=$TEMP\${NETInstaller} "Files\Redist\${NETInstaller}"
|
||||
|
||||
DetailPrint "Starting Microsoft .NET Framework v${NETVersion} Setup..."
|
||||
ExecWait "$TEMP\${NETInstaller}"
|
||||
File /oname=$TEMP\${NETInstallerFileName} "${NETInstallerPath}"
|
||||
|
||||
!insertmacro CheckNetFramework 472
|
||||
Return
|
||||
|
||||
NETFrameworkInstalled:
|
||||
DetailPrint "Microsoft .NET Framework is already installed!"
|
||||
SectionEnd
|
||||
|
||||
|
||||
;--------------------------------
|
||||
;Installer Functions
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>Giants.Launcher</RootNamespace>
|
||||
<AssemblyName>Giants</AssemblyName>
|
||||
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<ApplicationIcon>giants.ico</ApplicationIcon>
|
||||
<IsWebBootstrapper>false</IsWebBootstrapper>
|
||||
|
|
@ -33,6 +33,7 @@
|
|||
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
|
||||
<UseApplicationTrust>false</UseApplicationTrust>
|
||||
<BootstrapperEnabled>true</BootstrapperEnabled>
|
||||
<TargetFrameworkProfile />
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
|
|
@ -44,6 +45,7 @@
|
|||
<WarningLevel>4</WarningLevel>
|
||||
<PlatformTarget>x86</PlatformTarget>
|
||||
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<DebugType>pdbonly</DebugType>
|
||||
|
|
@ -53,6 +55,7 @@
|
|||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<PlatformTarget>x86</PlatformTarget>
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="System" />
|
||||
|
|
@ -188,6 +191,12 @@
|
|||
<Install>true</Install>
|
||||
</BootstrapperPackage>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Giants.WebApi.Clients\Giants.WebApi.Clients.csproj">
|
||||
<Project>{d4c21170-82d4-4d1f-81ec-036835ac1238}</Project>
|
||||
<Name>Giants.WebApi.Clients</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<PropertyGroup>
|
||||
<PostBuildEvent>xcopy /DY "$(TargetPath)" "$(GIANTS_PATH)\$(TargetFileName)"</PostBuildEvent>
|
||||
|
|
|
|||
|
|
@ -29,9 +29,9 @@
|
|||
private void InitializeComponent()
|
||||
{
|
||||
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LauncherForm));
|
||||
this.btnExit = new Launcher.ImageButton();
|
||||
this.btnOptions = new Launcher.ImageButton();
|
||||
this.btnPlay = new Launcher.ImageButton();
|
||||
this.btnExit = new Giants.Launcher.ImageButton();
|
||||
this.btnOptions = new Giants.Launcher.ImageButton();
|
||||
this.btnPlay = new Giants.Launcher.ImageButton();
|
||||
this.updateProgressBar = new System.Windows.Forms.ProgressBar();
|
||||
this.txtProgress = new System.Windows.Forms.Label();
|
||||
((System.ComponentModel.ISupportInitialize)(this.btnExit)).BeginInit();
|
||||
|
|
@ -44,11 +44,11 @@
|
|||
this.btnExit.BackColor = System.Drawing.Color.Transparent;
|
||||
this.btnExit.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
this.btnExit.DialogResult = System.Windows.Forms.DialogResult.Cancel;
|
||||
this.btnExit.DownImage = Resources.exitpush;
|
||||
this.btnExit.HoverImage = Resources.exithover;
|
||||
this.btnExit.DownImage = global::Giants.Launcher.Resources.exitpush;
|
||||
this.btnExit.HoverImage = global::Giants.Launcher.Resources.exithover;
|
||||
this.btnExit.Location = new System.Drawing.Point(618, 451);
|
||||
this.btnExit.Name = "btnExit";
|
||||
this.btnExit.NormalImage = Resources.exit;
|
||||
this.btnExit.NormalImage = global::Giants.Launcher.Resources.exit;
|
||||
this.btnExit.Size = new System.Drawing.Size(100, 50);
|
||||
this.btnExit.TabIndex = 8;
|
||||
this.btnExit.TabStop = false;
|
||||
|
|
@ -60,11 +60,11 @@
|
|||
this.btnOptions.BackColor = System.Drawing.Color.Transparent;
|
||||
this.btnOptions.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
this.btnOptions.DialogResult = System.Windows.Forms.DialogResult.None;
|
||||
this.btnOptions.DownImage = Resources.optionspush;
|
||||
this.btnOptions.HoverImage = Resources.optionshover;
|
||||
this.btnOptions.DownImage = global::Giants.Launcher.Resources.optionspush;
|
||||
this.btnOptions.HoverImage = global::Giants.Launcher.Resources.optionshover;
|
||||
this.btnOptions.Location = new System.Drawing.Point(618, 395);
|
||||
this.btnOptions.Name = "btnOptions";
|
||||
this.btnOptions.NormalImage = Resources.options;
|
||||
this.btnOptions.NormalImage = global::Giants.Launcher.Resources.options;
|
||||
this.btnOptions.Size = new System.Drawing.Size(118, 50);
|
||||
this.btnOptions.TabIndex = 7;
|
||||
this.btnOptions.TabStop = false;
|
||||
|
|
@ -76,8 +76,8 @@
|
|||
this.btnPlay.BackColor = System.Drawing.Color.Transparent;
|
||||
this.btnPlay.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
this.btnPlay.DialogResult = System.Windows.Forms.DialogResult.None;
|
||||
this.btnPlay.DownImage = Resources.playpush;
|
||||
this.btnPlay.HoverImage = Resources.playhover;
|
||||
this.btnPlay.DownImage = global::Giants.Launcher.Resources.playpush;
|
||||
this.btnPlay.HoverImage = global::Giants.Launcher.Resources.playhover;
|
||||
this.btnPlay.Location = new System.Drawing.Point(618, 339);
|
||||
this.btnPlay.Name = "btnPlay";
|
||||
this.btnPlay.NormalImage = ((System.Drawing.Image)(resources.GetObject("btnPlay.NormalImage")));
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,3 +1,3 @@
|
|||
<?xml version="1.0"?>
|
||||
<?xml version="1.0"?>
|
||||
<configuration>
|
||||
<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>
|
||||
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup></configuration>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
//----------------------
|
||||
// <auto-generated>
|
||||
// Generated using the NSwag toolchain v13.7.0.0 (NJsonSchema v10.1.24.0 (Newtonsoft.Json v12.0.0.0)) (http://NSwag.org)
|
||||
// Generated using the NSwag toolchain v13.7.0.0 (NJsonSchema v10.1.24.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org)
|
||||
// </auto-generated>
|
||||
//----------------------
|
||||
|
||||
|
|
@ -14,7 +14,7 @@ namespace Giants.WebApi.Clients
|
|||
{
|
||||
using System = global::System;
|
||||
|
||||
[System.CodeDom.Compiler.GeneratedCode("NSwag", "13.7.0.0 (NJsonSchema v10.1.24.0 (Newtonsoft.Json v12.0.0.0))")]
|
||||
[System.CodeDom.Compiler.GeneratedCode("NSwag", "13.7.0.0 (NJsonSchema v10.1.24.0 (Newtonsoft.Json v11.0.0.0))")]
|
||||
public partial class VersionClient
|
||||
{
|
||||
private string _baseUrl = "https://localhost:44304";
|
||||
|
|
@ -220,7 +220,7 @@ namespace Giants.WebApi.Clients
|
|||
}
|
||||
}
|
||||
|
||||
[System.CodeDom.Compiler.GeneratedCode("NSwag", "13.7.0.0 (NJsonSchema v10.1.24.0 (Newtonsoft.Json v12.0.0.0))")]
|
||||
[System.CodeDom.Compiler.GeneratedCode("NSwag", "13.7.0.0 (NJsonSchema v10.1.24.0 (Newtonsoft.Json v11.0.0.0))")]
|
||||
public partial class ServersClient
|
||||
{
|
||||
private string _baseUrl = "https://localhost:44304";
|
||||
|
|
@ -547,7 +547,7 @@ namespace Giants.WebApi.Clients
|
|||
}
|
||||
}
|
||||
|
||||
[System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.1.24.0 (Newtonsoft.Json v12.0.0.0)")]
|
||||
[System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.1.24.0 (Newtonsoft.Json v11.0.0.0)")]
|
||||
public partial class VersionInfo
|
||||
{
|
||||
[Newtonsoft.Json.JsonProperty("gameName", Required = Newtonsoft.Json.Required.Always)]
|
||||
|
|
@ -569,7 +569,7 @@ namespace Giants.WebApi.Clients
|
|||
|
||||
}
|
||||
|
||||
[System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.1.24.0 (Newtonsoft.Json v12.0.0.0)")]
|
||||
[System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.1.24.0 (Newtonsoft.Json v11.0.0.0)")]
|
||||
public partial class GiantsVersion
|
||||
{
|
||||
[Newtonsoft.Json.JsonProperty("build", Required = Newtonsoft.Json.Required.Always)]
|
||||
|
|
@ -587,7 +587,7 @@ namespace Giants.WebApi.Clients
|
|||
|
||||
}
|
||||
|
||||
[System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.1.24.0 (Newtonsoft.Json v12.0.0.0)")]
|
||||
[System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.1.24.0 (Newtonsoft.Json v11.0.0.0)")]
|
||||
public partial class ServerInfoWithHostAddress : ServerInfo
|
||||
{
|
||||
[Newtonsoft.Json.JsonProperty("hostIpAddress", Required = Newtonsoft.Json.Required.Always)]
|
||||
|
|
@ -597,7 +597,7 @@ namespace Giants.WebApi.Clients
|
|||
|
||||
}
|
||||
|
||||
[System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.1.24.0 (Newtonsoft.Json v12.0.0.0)")]
|
||||
[System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.1.24.0 (Newtonsoft.Json v11.0.0.0)")]
|
||||
public partial class ServerInfo
|
||||
{
|
||||
[Newtonsoft.Json.JsonProperty("gameName", Required = Newtonsoft.Json.Required.Always)]
|
||||
|
|
@ -654,7 +654,7 @@ namespace Giants.WebApi.Clients
|
|||
|
||||
}
|
||||
|
||||
[System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.1.24.0 (Newtonsoft.Json v12.0.0.0)")]
|
||||
[System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.1.24.0 (Newtonsoft.Json v11.0.0.0)")]
|
||||
public partial class PlayerInfo
|
||||
{
|
||||
[Newtonsoft.Json.JsonProperty("index", Required = Newtonsoft.Json.Required.Always)]
|
||||
|
|
@ -677,7 +677,7 @@ namespace Giants.WebApi.Clients
|
|||
|
||||
}
|
||||
|
||||
[System.CodeDom.Compiler.GeneratedCode("NSwag", "13.7.0.0 (NJsonSchema v10.1.24.0 (Newtonsoft.Json v12.0.0.0))")]
|
||||
[System.CodeDom.Compiler.GeneratedCode("NSwag", "13.7.0.0 (NJsonSchema v10.1.24.0 (Newtonsoft.Json v11.0.0.0))")]
|
||||
public partial class ApiException : System.Exception
|
||||
{
|
||||
public int StatusCode { get; private set; }
|
||||
|
|
@ -700,7 +700,7 @@ namespace Giants.WebApi.Clients
|
|||
}
|
||||
}
|
||||
|
||||
[System.CodeDom.Compiler.GeneratedCode("NSwag", "13.7.0.0 (NJsonSchema v10.1.24.0 (Newtonsoft.Json v12.0.0.0))")]
|
||||
[System.CodeDom.Compiler.GeneratedCode("NSwag", "13.7.0.0 (NJsonSchema v10.1.24.0 (Newtonsoft.Json v11.0.0.0))")]
|
||||
public partial class ApiException<TResult> : ApiException
|
||||
{
|
||||
public TResult Result { get; private set; }
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netcoreapp3.1</TargetFramework>
|
||||
<TargetFramework>net472</TargetFramework>
|
||||
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
|
||||
</PropertyGroup>
|
||||
|
||||
|
|
@ -25,9 +25,14 @@
|
|||
</PackageReference>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Reference Include="System.ComponentModel.DataAnnotations" />
|
||||
<Reference Include="System.Net.Http" />
|
||||
</ItemGroup>
|
||||
|
||||
<Target Name="NSwag" AfterTargets="Build">
|
||||
<Copy SourceFiles="@(ReferencePath)" DestinationFolder="$(OutDir)References" />
|
||||
<Exec Command="$(NSwagExe_Core31) run nswag.nswag /variables:Configuration=$(Configuration),OutDir=$(OutDir)" />
|
||||
<Exec Command="$(NSwagExe) run nswag.nswag /variables:Configuration=$(Configuration),OutDir=$(OutDir)" />
|
||||
<RemoveDir Directories="$(OutDir)References" />
|
||||
</Target>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"runtime": "NetCore31",
|
||||
"runtime": "WinX64",
|
||||
"defaultVariables": null,
|
||||
"documentGenerator": {
|
||||
"fromDocument": {
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Giants.WebApi", "Giants.Web
|
|||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Giants.Launcher", "Giants.Launcher\Giants.Launcher.csproj", "{612FD606-F072-4A04-9054-65BC592E9D3E}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Giants.WebApi.Clients", "Giants.WebApi.Clients\Giants.WebApi.Clients.csproj", "{D4C21170-82D4-4D1F-81EC-036835AC1238}"
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Giants.WebApi.Clients", "Giants.WebApi.Clients\Giants.WebApi.Clients.csproj", "{D4C21170-82D4-4D1F-81EC-036835AC1238}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
|
|
|
|||
Loading…
Reference in New Issue