Skip to content

Commit

Permalink
don't retrieve the json from cdn
Browse files Browse the repository at this point in the history
  • Loading branch information
@msarilar
msarilar committed Nov 4, 2016
1 parent ce67fbe commit 50f09ec
Show file tree
Hide file tree
Showing 17 changed files with 252 additions and 34 deletions.
4 changes: 2 additions & 2 deletions EDEngineer/EDEngineer.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
<CreateWebPageOnPublish>true</CreateWebPageOnPublish>
<WebPage>publish.htm</WebPage>
<OpenBrowserOnPublish>false</OpenBrowserOnPublish>
<ApplicationRevision>1</ApplicationRevision>
<ApplicationVersion>1.0.0.1</ApplicationVersion>
<ApplicationRevision>2</ApplicationRevision>
<ApplicationVersion>1.0.0.2</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<PublishWizardCompleted>true</PublishWizardCompleted>
<BootstrapperEnabled>true</BootstrapperEnabled>
Expand Down
27 changes: 1 addition & 26 deletions EDEngineer/Utils/System/IOManager.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,36 +166,11 @@ public static string RetrieveLogDirectory(bool forcePickFolder, string currentLo

public static string GetBlueprintsJson()
{
string json;

#if !DEBUG
try
{
using (var client = new HttpClient())
{
var getResponse = client.GetAsync(
"https://cdn.rawgit.com/msarilar/EDEngineer/master/EDEngineer/Resources/Data/blueprints.json")
.Result;

if (getResponse.StatusCode == HttpStatusCode.OK)
{
return getResponse.Content.ReadAsStringAsync().Result;
}
}
}
catch
{
// ignored
}
#endif

using (var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream("EDEngineer.Resources.Data.blueprints.json"))
using (var reader = new StreamReader(stream))
{
json = reader.ReadToEnd();
return reader.ReadToEnd();
}

return json;
}
}
}
28 changes: 28 additions & 0 deletions EDEngineer/releases/Application Files/EDEngineer_1_0_0_2/EDEngineer.application
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xrml="urn:mpeg:mpeg21:2003:01-REL-R-NS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
<assemblyIdentity name="EDEngineer.application" version="1.0.0.2" publicKeyToken="c7c2cd04d2cdd815" language="neutral" processorArchitecture="msil" xmlns="urn:schemas-microsoft-com:asm.v1" />
<description asmv2:publisher="EDEngineer" asmv2:product="EDEngineer" xmlns="urn:schemas-microsoft-com:asm.v1" />
<deployment install="true" mapFileExtensions="true">
<subscription>
<update>
<beforeApplicationStartup />
</update>
</subscription>
<deploymentProvider codebase="https://raw.githubusercontent.com/msarilar/EDEngineer/master/EDEngineer/releases/EDEngineer.application" />
</deployment>
<compatibleFrameworks xmlns="urn:schemas-microsoft-com:clickonce.v2">
<framework targetVersion="4.6.1" profile="Full" supportedRuntime="4.0.30319" />
</compatibleFrameworks>
<dependency>
<dependentAssembly dependencyType="install" codebase="Application Files\EDEngineer_1_0_0_2\EDEngineer.exe.manifest" size="13579">
<assemblyIdentity name="EDEngineer.exe" version="1.0.0.2" publicKeyToken="c7c2cd04d2cdd815" language="neutral" processorArchitecture="msil" type="win32" />
<hash>
<dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>7ZY95AreyJVbcvIrRefukNSeq2Pg3P8Bvk2sOLDZFas=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>
<publisherIdentity name="CN=GAMBIT6\Max" issuerKeyHash="11f40001e3715b07597e0eddab9728f9e30cc302" /><Signature Id="StrongNameSignature" xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" /><SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha256" /><Reference URI=""><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /><Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" /><DigestValue>SnsaaoyoHSPCoHj9JtngfJ4gzur2eV1QywnXJb+KGac=</DigestValue></Reference></SignedInfo><SignatureValue>CAW4Hg1hoMNYmJ9y/hIV8E587HJE9LFGzSfjufycW8mCjAaXx5GIpPD9boe9DbghxKyvhpSRxhNCIBRrAH2StvYcwAEZ13c0qkyxQJdJ6nlgFzXibwiXrIl9fbRpF3wg+AbGeXfCFtv8lXjoWOXqmh5stUjfdR95pJKVIvhaLvY=</SignatureValue><KeyInfo Id="StrongNameKeyInfo"><KeyValue><RSAKeyValue><Modulus>s3Rgw7x2D3+SLtMKutluM5M8B4WEs+Ug20EfdfHXvLbLVmZQc6zcjTSNAVuXx+DFhTw7Xfvs5y0MXW10LdLfiKq6aazW3Jt9gKcxqv/3nADJB/f2RuyVbpmLpwbG5ZTjAKRvo+VM6u+VI5UIM66zasrgjqympr2YoaV4wjeSXk0=</Modulus><Exponent>AQAB</Exponent></RSAKeyValue></KeyValue><msrel:RelData xmlns:msrel="http://schemas.microsoft.com/windows/rel/2005/reldata"><r:license xmlns:r="urn:mpeg:mpeg21:2003:01-REL-R-NS" xmlns:as="http://schemas.microsoft.com/windows/pki/2005/Authenticode"><r:grant><as:ManifestInformation Hash="a7198abf25d709cb505d79f6eace209e7ce0d926fd78a0c2231da88c6a1a7b4a" Description="" Url=""><as:assemblyIdentity name="EDEngineer.application" version="1.0.0.2" publicKeyToken="c7c2cd04d2cdd815" language="neutral" processorArchitecture="msil" xmlns="urn:schemas-microsoft-com:asm.v1" /></as:ManifestInformation><as:SignedBy /><as:AuthenticodePublisher><as:X509SubjectName>CN=GAMBIT6\Max</as:X509SubjectName></as:AuthenticodePublisher></r:grant><r:issuer><Signature Id="AuthenticodeSignature" xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" /><SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha256" /><Reference URI=""><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /><Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" /><DigestValue>1JPSyJ6J0CiyOA696F9J4VxbeHmw7ujn++mLXU3/6Gk=</DigestValue></Reference></SignedInfo><SignatureValue>aF3QpzMHQDANRYn9q8TdsoUM1dbBKX4wQQ2goJpPVFF5Qdhe+9OM0BkS87hHcsJcz2OkAlcUDwCmPSDMjVf/MSsAgPpst+2ZjXeHi8Z0QUgrOwgJG5DQq3CR94QNJ/PjujlEAnjnlnbrcl9BJqwBeclgX2pNnCdwKWoZ7veK9Gk=</SignatureValue><KeyInfo><KeyValue><RSAKeyValue><Modulus>s3Rgw7x2D3+SLtMKutluM5M8B4WEs+Ug20EfdfHXvLbLVmZQc6zcjTSNAVuXx+DFhTw7Xfvs5y0MXW10LdLfiKq6aazW3Jt9gKcxqv/3nADJB/f2RuyVbpmLpwbG5ZTjAKRvo+VM6u+VI5UIM66zasrgjqympr2YoaV4wjeSXk0=</Modulus><Exponent>AQAB</Exponent></RSAKeyValue></KeyValue><X509Data><X509Certificate>MIIBxTCCAS6gAwIBAgIQfKLD0d6RorlAQCjrdfkDHTANBgkqhkiG9w0BAQsFADAhMR8wHQYDVQQDHhYARwBBAE0AQgBJAFQANgBcAE0AYQB4MB4XDTE2MTEwMTE1MDgxOVoXDTE3MTEwMTIxMDgxOVowITEfMB0GA1UEAx4WAEcAQQBNAEIASQBUADYAXABNAGEAeDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAs3Rgw7x2D3+SLtMKutluM5M8B4WEs+Ug20EfdfHXvLbLVmZQc6zcjTSNAVuXx+DFhTw7Xfvs5y0MXW10LdLfiKq6aazW3Jt9gKcxqv/3nADJB/f2RuyVbpmLpwbG5ZTjAKRvo+VM6u+VI5UIM66zasrgjqympr2YoaV4wjeSXk0CAwEAATANBgkqhkiG9w0BAQsFAAOBgQA0l6SGR8ROw2A3Wxp1znVUThSCab6lWc0o/x6VJXn8PmxpvzLDNKqvz4PqP9GDv9DUiPSamsNCRA5yMmsIqD9q8bbtTRN6wYAtBwcP7tHi4OvYggM9UW3cBtJKBV9r+UvywN4847zsC3TPF0FgjEb3xqdCJEqYe3OXzdi0FLScSA==</X509Certificate></X509Data></KeyInfo></Signature></r:issuer></r:license></msrel:RelData></KeyInfo></Signature></asmv1:assembly>
33 changes: 33 additions & 0 deletions EDEngineer/releases/Application Files/EDEngineer_1_0_0_2/EDEngineer.exe.config.deploy
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>

<configuration>
<configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
<section name="EDEngineer.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
</sectionGroup>
</configSections>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<userSettings>
<EDEngineer.Properties.Settings>
<setting name="LogDirectory" serializeAs="String">
<value />
</setting>
<setting name="Shortcut" serializeAs="String">
<value />
</setting>
<setting name="UpgradeRequired" serializeAs="String">
<value>True</value>
</setting>
</EDEngineer.Properties.Settings>
</userSettings>
</configuration>
Binary file added EDEngineer/releases/Application Files/EDEngineer_1_0_0_2/EDEngineer.exe.deploy
View file
Binary file not shown.
Loading

0 comments on commit 50f09ec

Please sign in to comment.