Version 1.1.0, exe nicht mehr kopieren

SajjadToomari · Nov 13, 2015 · 2990196 · 2990196
1 parent fc8757d
commit 2990196
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 20 deletions.
diff --git a/SvgConverter/FileUtils.cs b/SvgConverter/FileUtils.cs
@@ -14,12 +14,13 @@ public enum PathIs
 
  public static class FileUtils
  {
-
  /// <summary>
  /// Creates a relative path from one file or folder to another.
  /// </summary>
  /// <param name="fromPath">Contains the directory that defines the start of the relative path.</param>
+ /// <param name="fromIs">Is the fromPath a File or a Folder</param>
  /// <param name="toPath">Contains the path that defines the endpoint of the relative path.</param>
+ /// <param name="toIs">Is the toPath a File or a Folder</param>
  /// <returns>The relative path from the start directory to the end path or <c>toPath</c> if the paths are not related.</returns>
  /// <exception cref="ArgumentNullException"></exception>
  /// <exception cref="UriFormatException"></exception>
@@ -29,6 +30,7 @@ public static String MakeRelativePath(String fromPath, PathIs fromIs, String toP
  if (String.IsNullOrEmpty(fromPath)) throw new ArgumentNullException("fromPath");
  if (String.IsNullOrEmpty(toPath)) throw new ArgumentNullException("toPath");
 
+ //Slash am Ende anfügen, damit Uri damit klarkommt und weiß, was ein Folder ist, und was nicht
  if (!fromPath.EndsWith(Path.DirectorySeparatorChar.ToString()) &&
  !fromPath.EndsWith(Path.AltDirectorySeparatorChar.ToString()) &&
  fromIs == PathIs.Folder)
@@ -52,7 +54,9 @@ public static String MakeRelativePath(String fromPath, PathIs fromIs, String toP
  }
  if (relativePath == string.Empty)
  relativePath = ".\\";
- return relativePath.TrimEnd(Path.DirectorySeparatorChar); //dies macht Probleme, insbesondere in CommandLine wenn quoted
+ //ein \ am Ende entfernen, dies macht Probleme, insbesondere in CommandLine wenn quoted
+ //zudem scheint der .Net - Standard zu sein, kein \ am Ende zu haben vgl. Path.GetDirectoryname()
+ return relativePath.TrimEnd(Path.DirectorySeparatorChar);
  }
  }
 }
diff --git a/SvgToXaml/Payload/T4Template.tt b/SvgToXaml/Payload/T4Template.tt
@@ -10,8 +10,7 @@
 <#@ import namespace="System.Linq" #>
 <#@ import namespace="System.Xml.Linq" #>
 <#@ import namespace="System.Collections" #>
-<#@ import namespace="System.Collections.Generic" #> 
-<# 
+<#@ import namespace="System.Collections.Generic" #><# 
  string xamlFile = Path.ChangeExtension(this.Host.TemplateFile, ".xaml");
  string nameSpace;
  string prefix;

diff --git a/SvgToXaml/Properties/AssemblyInfo.cs b/SvgToXaml/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // 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("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.1.0.0")]
+[assembly: AssemblyFileVersion("1.1.0.0")]
diff --git a/SvgToXaml/ViewModels/SvgImagesViewModel.cs b/SvgToXaml/ViewModels/SvgImagesViewModel.cs
@@ -122,16 +122,16 @@ private void BuildBatchFile(string outFileName, ResKeyInfo compResKeyInfo)
 
  File.WriteAllText(Path.Combine(CurrentDir, "Update.cmd"), batchText);
 
- //Copy ExeFile
- var srcFile = Environment.GetCommandLineArgs().First();
- var destFile = Path.Combine(CurrentDir, Path.GetFileName(srcFile));
- //Console.WriteLine("srcFile:", srcFile);
- //Console.WriteLine("destFile:", destFile);
- if (!string.Equals(srcFile, destFile, StringComparison.OrdinalIgnoreCase))
- {
- Console.WriteLine("Copying file...");
- File.Copy(srcFile, destFile, true);
- }
+ ////Copy ExeFile
+ //var srcFile = Environment.GetCommandLineArgs().First();
+ //var destFile = Path.Combine(CurrentDir, Path.GetFileName(srcFile));
+ ////Console.WriteLine("srcFile:", srcFile);
+ ////Console.WriteLine("destFile:", destFile);
+ //if (!string.Equals(srcFile, destFile, StringComparison.OrdinalIgnoreCase))
+ //{
+ // Console.WriteLine("Copying file...");
+ // File.Copy(srcFile, destFile, true);
+ //}
  }
  }
 

diff --git a/WpfDemoApp/ImagesC/ImagesC.cs b/WpfDemoApp/ImagesC/ImagesC.cs
@@ -1,5 +1,4 @@
- 
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using System.Windows;
 
 namespace WpfDemoApp.ImagesC

diff --git a/WpfDemoApp/ImagesC/ImagesC.tt b/WpfDemoApp/ImagesC/ImagesC.tt
@@ -10,8 +10,7 @@
 <#@ import namespace="System.Linq" #>
 <#@ import namespace="System.Xml.Linq" #>
 <#@ import namespace="System.Collections" #>
-<#@ import namespace="System.Collections.Generic" #> 
-<# 
+<#@ import namespace="System.Collections.Generic" #><# 
  string xamlFile = Path.ChangeExtension(this.Host.TemplateFile, ".xaml");
  string nameSpace;
  string prefix;