Skip to content

Commit

Permalink
Updates to flat solution:
Browse files Browse the repository at this point in the history 
Fix renamed FeedBuilder project
Add new Winforms update sample app
Create a dummy updater.exe with a prebuild event so the framework project will compile (otherwise the framework and updater form a circular build dependency)
  • Loading branch information
@drewkeller @synhershko
drewkeller authored and synhershko committed Jul 8, 2012
1 parent 1ec754c commit 3a905df
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 9 deletions.
53 changes: 44 additions & 9 deletions NAppUpdate_Flat.sln
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual C# Express 2010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FeedBuilder_CS", "FeedBuilder_CS\FeedBuilder_CS.csproj", "{734FA44E-39AC-478E-A5AA-0F3D1F1974AA}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NAppUpdate.Updater", "src\NAppUpdate.Updater\NAppUpdate.Updater.csproj", "{7D4D18D4-DBD2-4ADC-9D82-397D6C5E9F40}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NAppUpdate.Framework", "src\NAppUpdate.Framework\NAppUpdate.Framework.csproj", "{5C07EBDF-D43F-4BE9-B560-D7A443C0EDCE}"
Expand All @@ -11,45 +9,82 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinFormsSampleApp", "Sample
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WPFSampleApp", "Samples\WPFSampleApp\WPFSampleApp.csproj", "{D4321517-F941-4B1C-A9F7-9F63F5B86EE8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FeedBuilder", "FeedBuilder\FeedBuilder.csproj", "{734FA44E-39AC-478E-A5AA-0F3D1F1974AA}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinFormsProgressSample", "Samples\WinFormsProgressSample\WinFormsProgressSample.csproj", "{991B322D-C0EC-47A6-B67A-665C873C7B19}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|Mixed Platforms = Debug|Mixed Platforms
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|Mixed Platforms = Release|Mixed Platforms
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{734FA44E-39AC-478E-A5AA-0F3D1F1974AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{734FA44E-39AC-478E-A5AA-0F3D1F1974AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{734FA44E-39AC-478E-A5AA-0F3D1F1974AA}.Debug|x86.ActiveCfg = Debug|x86
{734FA44E-39AC-478E-A5AA-0F3D1F1974AA}.Debug|x86.Build.0 = Debug|x86
{734FA44E-39AC-478E-A5AA-0F3D1F1974AA}.Release|Any CPU.ActiveCfg = Release|x86
{734FA44E-39AC-478E-A5AA-0F3D1F1974AA}.Release|x86.ActiveCfg = Release|x86
{734FA44E-39AC-478E-A5AA-0F3D1F1974AA}.Release|x86.Build.0 = Release|x86
{7D4D18D4-DBD2-4ADC-9D82-397D6C5E9F40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7D4D18D4-DBD2-4ADC-9D82-397D6C5E9F40}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7D4D18D4-DBD2-4ADC-9D82-397D6C5E9F40}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{7D4D18D4-DBD2-4ADC-9D82-397D6C5E9F40}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{7D4D18D4-DBD2-4ADC-9D82-397D6C5E9F40}.Debug|x86.ActiveCfg = Debug|Any CPU
{7D4D18D4-DBD2-4ADC-9D82-397D6C5E9F40}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7D4D18D4-DBD2-4ADC-9D82-397D6C5E9F40}.Release|Any CPU.Build.0 = Release|Any CPU
{7D4D18D4-DBD2-4ADC-9D82-397D6C5E9F40}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{7D4D18D4-DBD2-4ADC-9D82-397D6C5E9F40}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{7D4D18D4-DBD2-4ADC-9D82-397D6C5E9F40}.Release|x86.ActiveCfg = Release|Any CPU
{5C07EBDF-D43F-4BE9-B560-D7A443C0EDCE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5C07EBDF-D43F-4BE9-B560-D7A443C0EDCE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5C07EBDF-D43F-4BE9-B560-D7A443C0EDCE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{5C07EBDF-D43F-4BE9-B560-D7A443C0EDCE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{5C07EBDF-D43F-4BE9-B560-D7A443C0EDCE}.Debug|x86.ActiveCfg = Debug|Any CPU
{5C07EBDF-D43F-4BE9-B560-D7A443C0EDCE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5C07EBDF-D43F-4BE9-B560-D7A443C0EDCE}.Release|Any CPU.Build.0 = Release|Any CPU
{5C07EBDF-D43F-4BE9-B560-D7A443C0EDCE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{5C07EBDF-D43F-4BE9-B560-D7A443C0EDCE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{5C07EBDF-D43F-4BE9-B560-D7A443C0EDCE}.Release|x86.ActiveCfg = Release|Any CPU
{935426A8-2F13-449E-A808-A3BD07AA3570}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{935426A8-2F13-449E-A808-A3BD07AA3570}.Debug|Any CPU.Build.0 = Debug|Any CPU
{935426A8-2F13-449E-A808-A3BD07AA3570}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{935426A8-2F13-449E-A808-A3BD07AA3570}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{935426A8-2F13-449E-A808-A3BD07AA3570}.Debug|x86.ActiveCfg = Debug|Any CPU
{935426A8-2F13-449E-A808-A3BD07AA3570}.Release|Any CPU.ActiveCfg = Release|Any CPU
{935426A8-2F13-449E-A808-A3BD07AA3570}.Release|Any CPU.Build.0 = Release|Any CPU
{935426A8-2F13-449E-A808-A3BD07AA3570}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{935426A8-2F13-449E-A808-A3BD07AA3570}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{935426A8-2F13-449E-A808-A3BD07AA3570}.Release|x86.ActiveCfg = Release|Any CPU
{D4321517-F941-4B1C-A9F7-9F63F5B86EE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D4321517-F941-4B1C-A9F7-9F63F5B86EE8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D4321517-F941-4B1C-A9F7-9F63F5B86EE8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{D4321517-F941-4B1C-A9F7-9F63F5B86EE8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{D4321517-F941-4B1C-A9F7-9F63F5B86EE8}.Debug|x86.ActiveCfg = Debug|Any CPU
{D4321517-F941-4B1C-A9F7-9F63F5B86EE8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D4321517-F941-4B1C-A9F7-9F63F5B86EE8}.Release|Any CPU.Build.0 = Release|Any CPU
{D4321517-F941-4B1C-A9F7-9F63F5B86EE8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{D4321517-F941-4B1C-A9F7-9F63F5B86EE8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{D4321517-F941-4B1C-A9F7-9F63F5B86EE8}.Release|x86.ActiveCfg = Release|Any CPU
{734FA44E-39AC-478E-A5AA-0F3D1F1974AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{734FA44E-39AC-478E-A5AA-0F3D1F1974AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{734FA44E-39AC-478E-A5AA-0F3D1F1974AA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{734FA44E-39AC-478E-A5AA-0F3D1F1974AA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{734FA44E-39AC-478E-A5AA-0F3D1F1974AA}.Debug|x86.ActiveCfg = Debug|x86
{734FA44E-39AC-478E-A5AA-0F3D1F1974AA}.Debug|x86.Build.0 = Debug|x86
{734FA44E-39AC-478E-A5AA-0F3D1F1974AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{734FA44E-39AC-478E-A5AA-0F3D1F1974AA}.Release|Any CPU.Build.0 = Release|Any CPU
{734FA44E-39AC-478E-A5AA-0F3D1F1974AA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{734FA44E-39AC-478E-A5AA-0F3D1F1974AA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{734FA44E-39AC-478E-A5AA-0F3D1F1974AA}.Release|x86.ActiveCfg = Release|x86
{734FA44E-39AC-478E-A5AA-0F3D1F1974AA}.Release|x86.Build.0 = Release|x86
{991B322D-C0EC-47A6-B67A-665C873C7B19}.Debug|Any CPU.ActiveCfg = Debug|x86
{991B322D-C0EC-47A6-B67A-665C873C7B19}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{991B322D-C0EC-47A6-B67A-665C873C7B19}.Debug|Mixed Platforms.Build.0 = Debug|x86
{991B322D-C0EC-47A6-B67A-665C873C7B19}.Debug|x86.ActiveCfg = Debug|x86
{991B322D-C0EC-47A6-B67A-665C873C7B19}.Debug|x86.Build.0 = Debug|x86
{991B322D-C0EC-47A6-B67A-665C873C7B19}.Release|Any CPU.ActiveCfg = Release|x86
{991B322D-C0EC-47A6-B67A-665C873C7B19}.Release|Mixed Platforms.ActiveCfg = Release|x86
{991B322D-C0EC-47A6-B67A-665C873C7B19}.Release|Mixed Platforms.Build.0 = Release|x86
{991B322D-C0EC-47A6-B67A-665C873C7B19}.Release|x86.ActiveCfg = Release|x86
{991B322D-C0EC-47A6-B67A-665C873C7B19}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
4 changes: 4 additions & 0 deletions src/NAppUpdate.Framework/NAppUpdate.Framework.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,10 @@
<EmbeddedResource Include="updateicon.ico" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PreBuildEvent>if not exist "$(SolutionDir)src\NAppUpdate.Framework\Updater" (mkdir "$(SolutionDir)src\NAppUpdate.Framework\Updater")
if not exist "$(SolutionDir)src\NAppUpdate.Framework\Updater\updater.exe" (echo This is a dummy file &gt; "$(SolutionDir)src\NAppUpdate.Framework\Updater\updater.exe")</PreBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Expand Down

0 comments on commit 3a905df

Please sign in to comment.