Skip to content

Commit

Permalink
Multiple changes addressing dargon-client.
Browse files Browse the repository at this point in the history 
- Loads resources happily when hosted by nestd
- Ensures mod directory exists before watching.

Published as dargon.io/files/dargon-2015-11-27-05-13.zip
  • Loading branch information
@miyu
miyu committed Nov 27, 2015
1 parent 4d65b7f commit 304a5aa
Show file tree
Hide file tree
Showing 4 changed files with 128 additions and 3 deletions.
2 changes: 1 addition & 1 deletion dargon
Submodule dargon updated 55 files
+7 −0 Dargon.Modifications.ThumbnailGenerator.Api/Dargon.ThumbnailGenerator.Api.csproj
+9 −0 Dargon.Modifications.ThumbnailGenerator.Api/ThumbnailGeneratorApiRyuPackage.cs
+53 −0 Dargon.Trinkets.Hosted.Api/Dargon.Trinkets.Hosted.Api.csproj
+36 −0 Dargon.Trinkets.Hosted.Api/Properties/AssemblyInfo.cs
+157 −0 Dargon.Trinkets.Hosted.Hooks.Api.Native/Dargon.Trinkets.Hosted.Hooks.Api.Native.vcxproj
+36 −0 Dargon.Trinkets.Hosted.Hooks.Api.Native/Dargon.Trinkets.Hosted.Hooks.Api.Native.vcxproj.filters
+37 −0 Dargon.Trinkets.Hosted.Hooks.Api.Native/ReadMe.txt
+47 −0 Dargon.Trinkets.Hosted.Hooks.Api.Native/TrinketNatives.hpp
+8 −0 Dargon.Trinkets.Hosted.Hooks.Api.Native/stdafx.cpp
+14 −0 Dargon.Trinkets.Hosted.Hooks.Api.Native/stdafx.h
+8 −0 Dargon.Trinkets.Hosted.Hooks.Api.Native/targetver.h
+54 −0 Dargon.Trinkets.Hosted.Hooks.Api/Dargon.Trinkets.Hosted.Hooks.Api.csproj
+40 −0 Dargon.Trinkets.Hosted.Hooks.Api/FileSystemHookEventBus.cs
+36 −0 Dargon.Trinkets.Hosted.Hooks.Api/Properties/AssemblyInfo.cs
+38 −0 Dargon.Trinkets.Hosted.Hooks.Impl.Native/AssemblyInfo.cpp
+174 −0 Dargon.Trinkets.Hosted.Hooks.Impl.Native/Dargon.Trinkets.Hosted.Hooks.Impl.Native.vcxproj
+52 −0 Dargon.Trinkets.Hosted.Hooks.Impl.Native/Dargon.Trinkets.Hosted.Hooks.Impl.Native.vcxproj.filters
+28 −0 Dargon.Trinkets.Hosted.Hooks.Impl.Native/FileHookEventPublisherNativeToManagedProxy.cpp
+33 −0 Dargon.Trinkets.Hosted.Hooks.Impl.Native/FileHookEventPublisherNativeToManagedProxy.h
+38 −0 Dargon.Trinkets.Hosted.Hooks.Impl.Native/ReadMe.txt
+5 −0 Dargon.Trinkets.Hosted.Hooks.Impl.Native/Stdafx.cpp
+10 −0 Dargon.Trinkets.Hosted.Hooks.Impl.Native/Stdafx.h
+ − Dargon.Trinkets.Hosted.Hooks.Impl.Native/app.ico
+ − Dargon.Trinkets.Hosted.Hooks.Impl.Native/app.rc
+3 −0 Dargon.Trinkets.Hosted.Hooks.Impl.Native/resource.h
+23 −2 DargonInjectedModule/Application.cpp
+1 −0 DargonInjectedModule/Configuration.cpp
+1 −0 DargonInjectedModule/Configuration.hpp
+4 −4 DargonInjectedModule/Dargon - Injected Module.vcxproj
+22 −1 DargonInjectedModule/Subsystems/FileSubsystem.cpp
+7 −1 DargonInjectedModule/Subsystems/FileSubsystem.hpp
+2 −1 DargonInjectedModule/main.cpp
+4 −4 DargonLibCpp/src/clr_host.cpp
+2 −1 DargonLibCpp/src/clr_host.hpp
+1 −1 clr-host-example/clr-host-example.cpp
+2 −1 clr-host-example/clr-host-example.vcxproj
+0 −2 clr-host-example/stdafx.h
+2 −2 clr-hosted-egg-example/TrinketProgram.cs
+1 −1 dargon-client/Controllers/ModificationImportController.cs
+1 −1 dargon-client/Properties/Resources.Designer.cs
+8 −5 dargon-client/Properties/Resources.resx
+2 −0 dargon-client/ViewModels/Helpers/ModificationListingSynchronizer.cs
+2 −2 dargon-client/Views/Helpers/GifImage.cs
+2 −2 dargon-client/Views/ModificationEntryStatusIndicator.xaml
+1 −1 dargon-client/Views/ModificationImportDirectoryView.xaml
+4 −4 dargon-client/Views/ModificationImportStatusView.xaml
+4 −0 libdargon.tray-impl/Dargon.Tray.Impl.csproj
+1 −1 libdargon.tray-impl/TrayImplRyuPackage.cs
+7 −4 libdargon.tray-impl/TrayServiceImpl.cs
+1 −0 libdargon.tray-impl/packages.config
+23 −0 trinket-managed/DebugProgram.cs
+58 −0 trinket-managed/HostedTrinketNestApplicationEgg.cs
+36 −0 trinket-managed/Properties/AssemblyInfo.cs
+39 −0 trinket-managed/TrinketEntryPoint.cs
+79 −0 trinket-managed/trinket-managed.csproj
109 changes: 109 additions & 0 deletions dargon-root.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,9 @@ EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ghetto-rads-dummy", "dargon\ghetto-rads-dummy\ghetto-rads-dummy.vcxproj", "{F32FC3C5-7363-4537-AE1F-35E0A6F75416}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "trinket-dim", "dargon\DargonInjectedModule\Dargon - Injected Module.vcxproj", "{D1C97EAF-0503-4031-A690-CD6CCAD48C5A}"
ProjectSection(ProjectDependencies) = postProject
{6615AB36-20B2-4F72-B5BF-7134E06F74C5} = {6615AB36-20B2-4F72-B5BF-7134E06F74C5}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dargon.Courier.Api", "dependencies\Dargon.Courier\Dargon.Courier\Dargon.Courier.Api.csproj", "{00A1DA2F-D316-4387-8BD4-F1A47C05A402}"
EndProject
Expand Down Expand Up @@ -336,6 +339,19 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clr-host-example", "dargon\
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "clr-hosted-egg-example", "dargon\clr-hosted-egg-example\clr-hosted-egg-example.csproj", "{B4AA97CC-AD14-43BB-A8BC-4510E973F798}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dargon.Trinkets.Hosted.Api", "dargon\Dargon.Trinkets.Hosted.Api\Dargon.Trinkets.Hosted.Api.csproj", "{53CD9D37-97F1-493A-AF83-A5C82F1CCECD}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dargon.Trinkets.Hosted.Hooks.Api", "dargon\Dargon.Trinkets.Hosted.Hooks.Api\Dargon.Trinkets.Hosted.Hooks.Api.csproj", "{DB85F2C6-AF38-49C8-B44C-2C8262A967C7}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dargon.Trinkets.Hosted.Hooks.Api.Native", "dargon\Dargon.Trinkets.Hosted.Hooks.Api.Native\Dargon.Trinkets.Hosted.Hooks.Api.Native.vcxproj", "{52D8CBEE-1B14-4FCA-B824-096A43776456}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dargon.Trinkets.Hosted.Hooks.Impl.Native", "dargon\Dargon.Trinkets.Hosted.Hooks.Impl.Native\Dargon.Trinkets.Hosted.Hooks.Impl.Native.vcxproj", "{08EB1A26-7629-430A-B6BD-CB8ECC7E1F38}"
ProjectSection(ProjectDependencies) = postProject
{52D8CBEE-1B14-4FCA-B824-096A43776456} = {52D8CBEE-1B14-4FCA-B824-096A43776456}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "trinket-managed", "dargon\trinket-managed\trinket-managed.csproj", "{6615AB36-20B2-4F72-B5BF-7134E06F74C5}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Console|Any CPU = Console|Any CPU
Expand Down Expand Up @@ -2547,6 +2563,94 @@ Global
{B4AA97CC-AD14-43BB-A8BC-4510E973F798}.Release|x64.Build.0 = Release|Any CPU
{B4AA97CC-AD14-43BB-A8BC-4510E973F798}.Release|x86.ActiveCfg = Release|Any CPU
{B4AA97CC-AD14-43BB-A8BC-4510E973F798}.Release|x86.Build.0 = Release|Any CPU
{53CD9D37-97F1-493A-AF83-A5C82F1CCECD}.Console|Any CPU.ActiveCfg = Release|Any CPU
{53CD9D37-97F1-493A-AF83-A5C82F1CCECD}.Console|Any CPU.Build.0 = Release|Any CPU
{53CD9D37-97F1-493A-AF83-A5C82F1CCECD}.Console|x64.ActiveCfg = Release|Any CPU
{53CD9D37-97F1-493A-AF83-A5C82F1CCECD}.Console|x64.Build.0 = Release|Any CPU
{53CD9D37-97F1-493A-AF83-A5C82F1CCECD}.Console|x86.ActiveCfg = Release|Any CPU
{53CD9D37-97F1-493A-AF83-A5C82F1CCECD}.Console|x86.Build.0 = Release|Any CPU
{53CD9D37-97F1-493A-AF83-A5C82F1CCECD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{53CD9D37-97F1-493A-AF83-A5C82F1CCECD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{53CD9D37-97F1-493A-AF83-A5C82F1CCECD}.Debug|x64.ActiveCfg = Debug|Any CPU
{53CD9D37-97F1-493A-AF83-A5C82F1CCECD}.Debug|x64.Build.0 = Debug|Any CPU
{53CD9D37-97F1-493A-AF83-A5C82F1CCECD}.Debug|x86.ActiveCfg = Debug|Any CPU
{53CD9D37-97F1-493A-AF83-A5C82F1CCECD}.Debug|x86.Build.0 = Debug|Any CPU
{53CD9D37-97F1-493A-AF83-A5C82F1CCECD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{53CD9D37-97F1-493A-AF83-A5C82F1CCECD}.Release|Any CPU.Build.0 = Release|Any CPU
{53CD9D37-97F1-493A-AF83-A5C82F1CCECD}.Release|x64.ActiveCfg = Release|Any CPU
{53CD9D37-97F1-493A-AF83-A5C82F1CCECD}.Release|x64.Build.0 = Release|Any CPU
{53CD9D37-97F1-493A-AF83-A5C82F1CCECD}.Release|x86.ActiveCfg = Release|Any CPU
{53CD9D37-97F1-493A-AF83-A5C82F1CCECD}.Release|x86.Build.0 = Release|Any CPU
{DB85F2C6-AF38-49C8-B44C-2C8262A967C7}.Console|Any CPU.ActiveCfg = Release|Any CPU
{DB85F2C6-AF38-49C8-B44C-2C8262A967C7}.Console|Any CPU.Build.0 = Release|Any CPU
{DB85F2C6-AF38-49C8-B44C-2C8262A967C7}.Console|x64.ActiveCfg = Release|Any CPU
{DB85F2C6-AF38-49C8-B44C-2C8262A967C7}.Console|x64.Build.0 = Release|Any CPU
{DB85F2C6-AF38-49C8-B44C-2C8262A967C7}.Console|x86.ActiveCfg = Release|Any CPU
{DB85F2C6-AF38-49C8-B44C-2C8262A967C7}.Console|x86.Build.0 = Release|Any CPU
{DB85F2C6-AF38-49C8-B44C-2C8262A967C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DB85F2C6-AF38-49C8-B44C-2C8262A967C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DB85F2C6-AF38-49C8-B44C-2C8262A967C7}.Debug|x64.ActiveCfg = Debug|Any CPU
{DB85F2C6-AF38-49C8-B44C-2C8262A967C7}.Debug|x64.Build.0 = Debug|Any CPU
{DB85F2C6-AF38-49C8-B44C-2C8262A967C7}.Debug|x86.ActiveCfg = Debug|Any CPU
{DB85F2C6-AF38-49C8-B44C-2C8262A967C7}.Debug|x86.Build.0 = Debug|Any CPU
{DB85F2C6-AF38-49C8-B44C-2C8262A967C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DB85F2C6-AF38-49C8-B44C-2C8262A967C7}.Release|Any CPU.Build.0 = Release|Any CPU
{DB85F2C6-AF38-49C8-B44C-2C8262A967C7}.Release|x64.ActiveCfg = Release|Any CPU
{DB85F2C6-AF38-49C8-B44C-2C8262A967C7}.Release|x64.Build.0 = Release|Any CPU
{DB85F2C6-AF38-49C8-B44C-2C8262A967C7}.Release|x86.ActiveCfg = Release|Any CPU
{DB85F2C6-AF38-49C8-B44C-2C8262A967C7}.Release|x86.Build.0 = Release|Any CPU
{52D8CBEE-1B14-4FCA-B824-096A43776456}.Console|Any CPU.ActiveCfg = Release|x64
{52D8CBEE-1B14-4FCA-B824-096A43776456}.Console|Any CPU.Build.0 = Release|x64
{52D8CBEE-1B14-4FCA-B824-096A43776456}.Console|x64.ActiveCfg = Release|x64
{52D8CBEE-1B14-4FCA-B824-096A43776456}.Console|x64.Build.0 = Release|x64
{52D8CBEE-1B14-4FCA-B824-096A43776456}.Console|x86.ActiveCfg = Release|Win32
{52D8CBEE-1B14-4FCA-B824-096A43776456}.Console|x86.Build.0 = Release|Win32
{52D8CBEE-1B14-4FCA-B824-096A43776456}.Debug|Any CPU.ActiveCfg = Debug|Win32
{52D8CBEE-1B14-4FCA-B824-096A43776456}.Debug|Any CPU.Build.0 = Debug|Win32
{52D8CBEE-1B14-4FCA-B824-096A43776456}.Debug|x64.ActiveCfg = Debug|x64
{52D8CBEE-1B14-4FCA-B824-096A43776456}.Debug|x64.Build.0 = Debug|x64
{52D8CBEE-1B14-4FCA-B824-096A43776456}.Debug|x86.ActiveCfg = Debug|Win32
{52D8CBEE-1B14-4FCA-B824-096A43776456}.Debug|x86.Build.0 = Debug|Win32
{52D8CBEE-1B14-4FCA-B824-096A43776456}.Release|Any CPU.ActiveCfg = Release|Win32
{52D8CBEE-1B14-4FCA-B824-096A43776456}.Release|x64.ActiveCfg = Release|x64
{52D8CBEE-1B14-4FCA-B824-096A43776456}.Release|x64.Build.0 = Release|x64
{52D8CBEE-1B14-4FCA-B824-096A43776456}.Release|x86.ActiveCfg = Release|Win32
{52D8CBEE-1B14-4FCA-B824-096A43776456}.Release|x86.Build.0 = Release|Win32
{08EB1A26-7629-430A-B6BD-CB8ECC7E1F38}.Console|Any CPU.ActiveCfg = Release|x64
{08EB1A26-7629-430A-B6BD-CB8ECC7E1F38}.Console|Any CPU.Build.0 = Release|x64
{08EB1A26-7629-430A-B6BD-CB8ECC7E1F38}.Console|x64.ActiveCfg = Release|x64
{08EB1A26-7629-430A-B6BD-CB8ECC7E1F38}.Console|x64.Build.0 = Release|x64
{08EB1A26-7629-430A-B6BD-CB8ECC7E1F38}.Console|x86.ActiveCfg = Release|Win32
{08EB1A26-7629-430A-B6BD-CB8ECC7E1F38}.Console|x86.Build.0 = Release|Win32
{08EB1A26-7629-430A-B6BD-CB8ECC7E1F38}.Debug|Any CPU.ActiveCfg = Debug|Win32
{08EB1A26-7629-430A-B6BD-CB8ECC7E1F38}.Debug|Any CPU.Build.0 = Debug|Win32
{08EB1A26-7629-430A-B6BD-CB8ECC7E1F38}.Debug|x64.ActiveCfg = Debug|x64
{08EB1A26-7629-430A-B6BD-CB8ECC7E1F38}.Debug|x64.Build.0 = Debug|x64
{08EB1A26-7629-430A-B6BD-CB8ECC7E1F38}.Debug|x86.ActiveCfg = Debug|Win32
{08EB1A26-7629-430A-B6BD-CB8ECC7E1F38}.Debug|x86.Build.0 = Debug|Win32
{08EB1A26-7629-430A-B6BD-CB8ECC7E1F38}.Release|Any CPU.ActiveCfg = Release|Win32
{08EB1A26-7629-430A-B6BD-CB8ECC7E1F38}.Release|x64.ActiveCfg = Release|x64
{08EB1A26-7629-430A-B6BD-CB8ECC7E1F38}.Release|x64.Build.0 = Release|x64
{08EB1A26-7629-430A-B6BD-CB8ECC7E1F38}.Release|x86.ActiveCfg = Release|Win32
{08EB1A26-7629-430A-B6BD-CB8ECC7E1F38}.Release|x86.Build.0 = Release|Win32
{6615AB36-20B2-4F72-B5BF-7134E06F74C5}.Console|Any CPU.ActiveCfg = Release|Any CPU
{6615AB36-20B2-4F72-B5BF-7134E06F74C5}.Console|Any CPU.Build.0 = Release|Any CPU
{6615AB36-20B2-4F72-B5BF-7134E06F74C5}.Console|x64.ActiveCfg = Release|Any CPU
{6615AB36-20B2-4F72-B5BF-7134E06F74C5}.Console|x64.Build.0 = Release|Any CPU
{6615AB36-20B2-4F72-B5BF-7134E06F74C5}.Console|x86.ActiveCfg = Release|Any CPU
{6615AB36-20B2-4F72-B5BF-7134E06F74C5}.Console|x86.Build.0 = Release|Any CPU
{6615AB36-20B2-4F72-B5BF-7134E06F74C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6615AB36-20B2-4F72-B5BF-7134E06F74C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6615AB36-20B2-4F72-B5BF-7134E06F74C5}.Debug|x64.ActiveCfg = Debug|Any CPU
{6615AB36-20B2-4F72-B5BF-7134E06F74C5}.Debug|x64.Build.0 = Debug|Any CPU
{6615AB36-20B2-4F72-B5BF-7134E06F74C5}.Debug|x86.ActiveCfg = Debug|Any CPU
{6615AB36-20B2-4F72-B5BF-7134E06F74C5}.Debug|x86.Build.0 = Debug|Any CPU
{6615AB36-20B2-4F72-B5BF-7134E06F74C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6615AB36-20B2-4F72-B5BF-7134E06F74C5}.Release|Any CPU.Build.0 = Release|Any CPU
{6615AB36-20B2-4F72-B5BF-7134E06F74C5}.Release|x64.ActiveCfg = Release|Any CPU
{6615AB36-20B2-4F72-B5BF-7134E06F74C5}.Release|x64.Build.0 = Release|Any CPU
{6615AB36-20B2-4F72-B5BF-7134E06F74C5}.Release|x86.ActiveCfg = Release|Any CPU
{6615AB36-20B2-4F72-B5BF-7134E06F74C5}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -2704,5 +2808,10 @@ Global
{55278C7A-3D94-433B-B459-B3D9D2CDA96E} = {AF6077B8-253D-46E1-B758-78919185D362}
{39399A97-831C-486C-88F7-229852168E10} = {4B02B459-A828-40A5-9E58-525EEADAFA6E}
{B4AA97CC-AD14-43BB-A8BC-4510E973F798} = {4B02B459-A828-40A5-9E58-525EEADAFA6E}
{53CD9D37-97F1-493A-AF83-A5C82F1CCECD} = {8BB34446-5A0C-4BBE-92E0-42EE38BE8D29}
{DB85F2C6-AF38-49C8-B44C-2C8262A967C7} = {8BB34446-5A0C-4BBE-92E0-42EE38BE8D29}
{52D8CBEE-1B14-4FCA-B824-096A43776456} = {8BB34446-5A0C-4BBE-92E0-42EE38BE8D29}
{08EB1A26-7629-430A-B6BD-CB8ECC7E1F38} = {8BB34446-5A0C-4BBE-92E0-42EE38BE8D29}
{6615AB36-20B2-4F72-B5BF-7134E06F74C5} = {8873D806-008B-4A18-B151-1BAF537A46E9}
EndGlobalSection
EndGlobal
10 changes: 9 additions & 1 deletion dev/start-nest-and-core/App.config
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System" publicKeyToken="b77a5c561934e089" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
10 changes: 9 additions & 1 deletion dev/start-nest-core-and-client/App.config
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System" publicKeyToken="b77a5c561934e089" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

0 comments on commit 304a5aa

Please sign in to comment.