diff --git a/SparkleLib/windows/GlobalAssemblyInfo.tt b/SparkleLib/windows/GlobalAssemblyInfo.tt index 104f2cafe..36b1865d3 100644 --- a/SparkleLib/windows/GlobalAssemblyInfo.tt +++ b/SparkleLib/windows/GlobalAssemblyInfo.tt @@ -11,7 +11,7 @@ using System.Reflection; using System.Runtime.CompilerServices; -[assembly: AssemblyProduct("SparkleShare")] +[assembly: AssemblyProduct("SparkleLib.Git")] [assembly: AssemblyVersion("<#= ASM_VERSION #>")] [assembly: AssemblyFileVersion("<#= ASM_FILE_VERSION #>")] diff --git a/SparkleLib/windows/GlobalAssemblyInfoGit.tt b/SparkleLib/windows/GlobalAssemblyInfoGit.tt new file mode 100644 index 000000000..104f2cafe --- /dev/null +++ b/SparkleLib/windows/GlobalAssemblyInfoGit.tt @@ -0,0 +1,25 @@ +/* + * GlobalAssemblyInfo.cs + * + * This is free software. See COPYING for details. + */ +<#@ template language="C#v3.5" HostSpecific="true" #> +<#@ output extension="cs" #> + +<#@ include file="getversion.tt" #> + +using System.Reflection; +using System.Runtime.CompilerServices; + +[assembly: AssemblyProduct("SparkleShare")] + +[assembly: AssemblyVersion("<#= ASM_VERSION #>")] +[assembly: AssemblyFileVersion("<#= ASM_FILE_VERSION #>")] +[assembly: AssemblyInformationalVersion("<#= VERSION #>")] + +#if DEBUG +[assembly: AssemblyConfiguration("Debug")] +#else +[assembly: AssemblyConfiguration("Release")] +#endif + diff --git a/SparkleLib/windows/SparkleLib.Git.csproj b/SparkleLib/windows/SparkleLib.Git.csproj new file mode 100644 index 000000000..d0d080c41 --- /dev/null +++ b/SparkleLib/windows/SparkleLib.Git.csproj @@ -0,0 +1,92 @@ + + + + Debug + AnyCPU + 9.0.30729 + 2.0 + {009FDCD7-1D57-4202-BB6D-8477D8C6B8EE} + Library + Properties + SparkleLib.Git + SparkleLib.Git + v3.5 + 512 + + + true + full + false + ..\..\bin\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + ..\..\bin\ + TRACE + prompt + 4 + + + + TextTemplatingFileGenerator + Defines.cs + + + TextTemplatingFileGenerator + GlobalAssemblyInfoGit.cs + + + + + + + + SparkleFetcherGit.cs + + + SparkleGit.cs + Component + + + SparkleRepoGit.cs + + + True + True + Defines.tt + + + True + True + GlobalAssemblyInfoGit.tt + + + + + {2C914413-B31C-4362-93C7-1AE34F09112A} + SparkleLib + + + + + + + + + + + + + $(ProjectDir)transform_tt.cmd + + \ No newline at end of file diff --git a/SparkleLib/windows/SparkleLib.csproj b/SparkleLib/windows/SparkleLib.csproj index 2db89ec8e..dcc640401 100644 --- a/SparkleLib/windows/SparkleLib.csproj +++ b/SparkleLib/windows/SparkleLib.csproj @@ -61,16 +61,6 @@ - - SparkleFetcherGit.cs - - - SparkleGit.cs - Component - - - SparkleRepoGit.cs - SparkleAnnouncement.cs diff --git a/SparkleLib/windows/transform_tt.cmd b/SparkleLib/windows/transform_tt.cmd index 3ba9ef606..e2cb3880c 100644 --- a/SparkleLib/windows/transform_tt.cmd +++ b/SparkleLib/windows/transform_tt.cmd @@ -8,4 +8,4 @@ echo running texttransform.. %TextTransform% -out Defines.cs Defines.tt %TextTransform% -out GlobalAssemblyInfo.cs GlobalAssemblyInfo.tt - +%TextTransform% -out GlobalAssemblyInfoGit.cs GlobalAssemblyInfoGit.tt diff --git a/SparkleShare/Windows/SparkleShare.csproj b/SparkleShare/Windows/SparkleShare.csproj index 365b54559..065690cfe 100644 --- a/SparkleShare/Windows/SparkleShare.csproj +++ b/SparkleShare/Windows/SparkleShare.csproj @@ -5,7 +5,7 @@ AnyCPU 9.0.30729 {728483AA-E34B-4441-BF2C-C8BC2901E4E0} - Exe + WinExe SparkleShare 2.0 SparkleShare diff --git a/SparkleShare/Windows/SparkleShare.sln b/SparkleShare/Windows/SparkleShare.sln index 5f5b3a2b7..70ef9a9b3 100644 --- a/SparkleShare/Windows/SparkleShare.sln +++ b/SparkleShare/Windows/SparkleShare.sln @@ -7,6 +7,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleLib", "..\..\Sparkle EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleShareInviteOpen", "SparkleShareInviteOpen\SparkleShareInviteOpen.csproj", "{1DB5492D-B897-4A5E-8DD7-175EC65F52F2}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleLib.Git", "..\..\SparkleLib\windows\SparkleLib.Git.csproj", "{009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -25,6 +27,10 @@ Global {1DB5492D-B897-4A5E-8DD7-175EC65F52F2}.Debug|Any CPU.Build.0 = Debug|Any CPU {1DB5492D-B897-4A5E-8DD7-175EC65F52F2}.Release|Any CPU.ActiveCfg = Release|Any CPU {1DB5492D-B897-4A5E-8DD7-175EC65F52F2}.Release|Any CPU.Build.0 = Release|Any CPU + {009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/SparkleShare/Windows/SparkleShare.wxs b/SparkleShare/Windows/SparkleShare.wxs index 308374f48..fd9c68090 100644 --- a/SparkleShare/Windows/SparkleShare.wxs +++ b/SparkleShare/Windows/SparkleShare.wxs @@ -22,6 +22,7 @@ + @@ -81,7 +82,7 @@ - +