Version 3.22.

Fixed project modify bug in VS 2015.

VersionInfo.cs

@@ -0,0 +1,18 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("johnshope.com")]
+[assembly: AssemblyProduct("XamlImageConverter")]
+[assembly: AssemblyCopyright("Copyright © 2016 johnshope.com")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+[assembly: ComVisible(false)]
+[assembly: AssemblyVersion("3.22")]
+[assembly: AssemblyFileVersion("3.22.0")]
+
+public static class XIC {
+ public const string Version = "3.22";
+}

XamlImageConverter.Awesomium/Lazy/Awesomium/Awesomium.Mono.dll.config

@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<configuration>
+ <dllmap dll="awesomium" target="libawesomium-1-7.so.0.0" os="linux"/>
+ <dllmap dll="awesomium" target="@executable_path/../Frameworks/Awesomium.framework/Versions/A/Awesomium" os="osx"/>
+ <dllmap dll="awesomium_d" target="./../Frameworks/Awesomium.framework/Versions/A/Awesomium" os="osx"/>
+</configuration>

XamlImageConverter.Awesomium/Properties/AssemblyInfo.cs

@@ -6,31 +6,6 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("XamlImageConverter.Awesomium")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("XamlImageConverter.Awesomium")]
-[assembly: AssemblyCopyright("Copyright © 2013")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components. If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("894d6454-c62e-4060-b05c-0f30784b4d91")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version 
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.12.0.0")]
-[assembly: AssemblyFileVersion("3.12.0.0")]
+[assembly: Guid("894d6454-c62e-4060-b05c-0f30784b4d91")]

XamlImageConverter.Awesomium/XamlImageConverter.Awesomium.csproj

@@ -30,6 +30,7 @@
  <ErrorReport>prompt</ErrorReport>
  <WarningLevel>4</WarningLevel>
  <PlatformTarget>x86</PlatformTarget>
+ <UseVSHostingProcess>false</UseVSHostingProcess>
  </PropertyGroup>
  <PropertyGroup>
  <SignAssembly>true</SignAssembly>
@@ -63,39 +64,89 @@
  <ItemGroup>
  <Compile Include="Html2PDF.cs" />
  <Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="..\VersionInfo.cs">
+ <Link>Properties\VersionInfo.cs</Link>
+ </Compile>
  </ItemGroup>
  <ItemGroup>
- <Content Include="Lazy\Awesomium\avcodec-53.dll" />
- <Content Include="Lazy\Awesomium\avformat-53.dll" />
- <Content Include="Lazy\Awesomium\avutil-51.dll" />
- <Content Include="Lazy\Awesomium\Awesomium.Core.dll" />
- <Content Include="Lazy\Awesomium\Awesomium.Core.XML" />
- <Content Include="Lazy\Awesomium\awesomium.dll" />
- <Content Include="Lazy\Awesomium\Awesomium.Mono.dll" />
- <Content Include="Lazy\Awesomium\Awesomium.Mono.XML" />
- <Content Include="Lazy\Awesomium\Awesomium.Windows.Controls.dll" />
- <Content Include="Lazy\Awesomium\Awesomium.Windows.Controls.XML" />
- <Content Include="Lazy\Awesomium\Awesomium.Windows.Forms.dll" />
- <Content Include="Lazy\Awesomium\Awesomium.Windows.Forms.XML" />
+ <Content Include="Lazy\Awesomium\avcodec-53.dll">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Lazy\Awesomium\avformat-53.dll">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Lazy\Awesomium\avutil-51.dll">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Lazy\Awesomium\Awesomium.Core.dll">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Lazy\Awesomium\Awesomium.Core.XML">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Lazy\Awesomium\awesomium.dll">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Lazy\Awesomium\Awesomium.Mono.dll">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Lazy\Awesomium\Awesomium.Mono.XML">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Lazy\Awesomium\Awesomium.Windows.Controls.dll">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Lazy\Awesomium\Awesomium.Windows.Controls.XML">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Lazy\Awesomium\Awesomium.Windows.Forms.dll">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Lazy\Awesomium\Awesomium.Windows.Forms.XML">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Lazy\Awesomium\Design\Awesomium.Windows.Controls.Design.10.dll" />
+ <Content Include="Lazy\Awesomium\Design\Awesomium.Windows.Controls.Design.11.dll" />
+ <Content Include="Lazy\Awesomium\Design\Awesomium.Windows.Controls.Design.12.dll" />
  <Content Include="Lazy\Awesomium\Design\Awesomium.Windows.Controls.Design.dll" />
  <Content Include="Lazy\Awesomium\Design\Awesomium.Windows.Forms.Design.dll" />
  <Content Include="Lazy\Awesomium\Design\README.txt" />
- <Content Include="Lazy\Awesomium\icudt.dll" />
- <Content Include="Lazy\Awesomium\libEGL.dll" />
- <Content Include="Lazy\Awesomium\libGLESv2.dll" />
+ <Content Include="Lazy\Awesomium\icudt.dll">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Lazy\Awesomium\libEGL.dll">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Lazy\Awesomium\libGLESv2.dll">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
  <Content Include="Lazy\Awesomium\Packed\Awesomium.Core.dll" />
  <Content Include="Lazy\Awesomium\Packed\README.txt" />
- <Content Include="Lazy\Awesomium\README.txt" />
- <Content Include="Lazy\Awesomium\xinput9_1_0.dll" />
+ <Content Include="Lazy\Awesomium\README.txt">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Lazy\Awesomium\xinput9_1_0.dll">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
  </ItemGroup>
  <ItemGroup>
- <Content Include="Lazy\Awesomium\awesomium_process" />
+ <Content Include="Lazy\Awesomium\awesomium_process">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
  </ItemGroup>
  <ItemGroup>
- <Content Include="Lazy\Awesomium\inspector.pak" />
+ <Content Include="Lazy\Awesomium\inspector.pak">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
  </ItemGroup>
  <ItemGroup>
  <None Include="app.config" />
+ <Content Include="Lazy\Awesomium\Awesomium.Mono.dll.config">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Lazy\Awesomium\pdf_js.pak">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
  <None Include="sgKey.snk" />
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

XamlImageConverter.Exe/Program.cs

@@ -22,7 +22,7 @@ public static void Main(string[] args) {
  }
 
  if (a.Count == 0 || new[] { "-h", "help", "-help", "?", "/?", "-?" }.Any(s => a.Any(at => s == at.Trim().ToLower()))) {
- Console.WriteLine("XamlImageConverter 3.12 by Chris Cavanagh & David Egli");
+ Console.WriteLine("XamlImageConverter 3.2 by Chris Cavanagh & David Egli");
  Console.WriteLine("Creates snapshots, gif animations or html image maps from XAML, SVG & PSD images\n\r");
  Console.Error.WriteLine("XamlImageConverter [-x] [-w] [-1] [-s [running time]] [-r] [-v]");
  Console.Error.WriteLine(" [-l librarypath] [-p projectpath] configFile { configFile }");
@@ -43,15 +43,17 @@ public static void Main(string[] args) {
  Console.Error.WriteLine(" -v option: Create logfiles.");
  Console.Error.WriteLine(" -f option: Don't use separate AppDomain for each sourcefile.");
  Console.Error.WriteLine(" Speeds up compilation but uses more memory.");
+ Console.Error.WriteLine(" -m option: Specificy compiler mode, either Loose, Compiled or Both,");
+ Console.Error.WriteLine(" for compiling only loose or compiled xaml or both.");
  Console.Error.WriteLine(" -? option: Show this help text.");
  a.Remove("-h");
  a.Remove("help");
  a.Remove("-help");
  a.Remove("?");
  a.Remove("/?");
  a.Remove("-?");
- } 
- 
+ }
+
  if (a.Contains("-w")) {
  a.Remove("-w");
  waitForKey = true;
@@ -88,6 +90,14 @@ public static void Main(string[] args) {
  a.Remove("-f");
  }
 
+ Compiler.Modes mode = Compiler.Modes.Both;
+ if (a.Contains("-m")) {
+ var ix = a.IndexOf("-m");
+ if (ix < a.Count-1) mode = (Compiler.Modes)Enum.Parse(typeof(Compiler.Modes), a[ix+1]);
+ a.RemoveAt(ix);
+ a.Remove("-f");
+ }
+
  bool log = false;
  if (a.Contains("-v")) {
  log = true;
@@ -113,7 +123,7 @@ public static void Main(string[] args) {
  List<string> files = new List<string>();
  foreach (var f in a) {
  var appRoot = projectPath;
-  var file = f;
+ var file = f;
  if (appRoot.EndsWith("\\")) appRoot = appRoot.Substring(0, appRoot.Length - 1);
  file = file.Replace("~", appRoot)
  .Replace("/", "\\");
@@ -133,7 +143,7 @@ public static void Main(string[] args) {
  var cserver = new CompilerServer();
  if (RunTime.Ticks != 0) cserver.RunTime = RunTime;
  if (test) {
- ThreadPool.QueueUserWorkItem(delegate(object state) {
+ ThreadPool.QueueUserWorkItem(delegate (object state) {
  Thread.Sleep(20);
  var compiler = new Compiler();
  compiler.LibraryPath = libraryPath;
@@ -147,7 +157,7 @@ public static void Main(string[] args) {
  });
  }
  cserver.Start();
- 
+
  } else {
  var compiler = new Compiler();
  compiler.LibraryPath = libraryPath;

XamlImageConverter.Exe/Properties/AssemblyInfo.cs

@@ -6,31 +6,6 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle( "XamlImageConverter" )]
-[assembly: AssemblyDescription( "" )]
-[assembly: AssemblyConfiguration( "" )]
-[assembly: AssemblyCompany( "" )]
-[assembly: AssemblyProduct( "XamlImageConverter" )]
-[assembly: AssemblyCopyright( "Copyright © 2012" )]
-[assembly: AssemblyTrademark( "" )]
-[assembly: AssemblyCulture( "" )]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components. If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible( false )]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid( "0d84892a-6208-40e0-b22a-ab1eb634afd3" )]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version 
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion( "3.12.0.0" )]
-[assembly: AssemblyFileVersion( "3.12.0.0" )]
+[assembly: Guid( "0d84892a-6208-40e0-b22a-ab1eb634afd3" )]

XamlImageConverter.Exe/XamlImageConverter.Exe.csproj

@@ -109,6 +109,10 @@
  <DependentUpon>ProjectInstaller.cs</DependentUpon>
  </Compile>
  <Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="..\VersionInfo.cs">
+ <Link>Properties\VersionInfo.cs</Link>
+ </Compile>
+
  <Compile Include="Service.cs">
  <SubType>Component</SubType>
  </Compile>

XamlImageConverter.Exe/XamlImageConverter.Exe.csproj.user

@@ -4,7 +4,7 @@
  <StartArguments>-w -v -f -l "D:\Code\Visitenkarte\Simon Egli\bin\Debug" -p "D:\Code\Visitenkarte\Simon Egli" "D:\Code\Visitenkarte\Simon Egli\CreateWidmung.xic.xaml"</StartArguments>
  </PropertyGroup>
  <PropertyGroup>
- <ProjectView>ShowAllFiles</ProjectView>
+ <ProjectView>ProjectFiles</ProjectView>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
  <StartArguments>-p "D:\Code\Visitenkarte\Simon Egli" -l "D:\Code\Visitenkarte\Simon Egli\bin\Debug" -w -f ~/CreateWidmung.xic.xaml</StartArguments>