Skip to content

Commit 486408f

Browse files
JoshMcCulloughJoshMcCullough
committed
Fixed #8 - Rework how samples are included in Client setup project.
1 parent 27a7327 commit 486408f

7 files changed

Lines changed: 24 additions & 21 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,5 +110,5 @@ UpgradeLog*.XML
110110
Source/Client-WPF
111111
Source/Setup
112112
.vs
113-
Source/Client/Samples/*
113+
Source/Samples/*.zip
114114
.tfignore

‎Source/Client/Client.csproj‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -594,12 +594,6 @@
594594
<Content Include="Resources\Package.ico" />
595595
<Content Include="Resources\Package.png" />
596596
<Content Include="Resources\Watermark.png" />
597-
<None Include="Samples\Sample-CS-EF.zip">
598-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
599-
</None>
600-
<None Include="Samples\Sample-CS-LINQ.zip">
601-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
602-
</None>
603597
</ItemGroup>
604598
<ItemGroup>
605599
<None Include="Resources\Open.ico" />
@@ -688,18 +682,6 @@
688682
</ItemGroup>
689683
<ItemGroup />
690684
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
691-
<Target Name="BeforeBuild" Condition="$(Configuration.StartsWith('Release'))">
692-
<ItemGroup>
693-
<Sample-CS-EF Include="..\Samples\Sample-CS-EF\**\*" Exclude="..\Samples\Sample-CS-EF\**\bin\**;..\Samples\Sample-CS-EF\**\obj\**;..\Samples\Sample-CS-EF\**\*.user;..\Samples\Sample-CS-EF\**\*.suo;..\Samples\Sample-CS-EF\**\.svn\**;..\Samples\Sample-CS-EF\**\*.dgen;..\Samples\Sample-CS-EF\**\*.dbmdl;..\Samples\Sample-CS-EF\**\*.schemaview;..\Samples\Sample-CS-EF\**\sql\**;..\Samples\Sample-CS-EF\**\*.xpr;" />
694-
<Sample-CS-LINQ Include="..\Samples\Sample-CS-LINQ\**\*" Exclude="..\Samples\Sample-CS-LINQ\**\bin\**;..\Samples\Sample-CS-LINQ\**\obj\**;..\Samples\Sample-CS-LINQ\**\*.user;..\Samples\Sample-CS-LINQ\**\*.suo;..\Samples\Sample-CS-LINQ\**\.svn\**;..\Samples\Sample-CS-LINQ\**\*.dgen;..\Samples\Sample-CS-LINQ\**\*.dbmdl;..\Samples\Sample-CS-LINQ\**\*.schemaview;..\Samples\Sample-CS-LINQ\**\sql\**;..\Samples\Sample-CS-LINQ\**\*.xpr;" />
695-
</ItemGroup>
696-
697-
<Message Importance="high" Text="Archiving CS-EF sample..."/>
698-
<Zip ZipFileName="Samples\Sample-CS-EF.zip" ZipLevel="9" Files="@(Sample-CS-EF)" WorkingDirectory="..\Samples\" />
699-
700-
<Message Importance="high" Text="Archiving CS-LINQ sample..."/>
701-
<Zip ZipFileName="Samples\Sample-CS-LINQ.zip" ZipLevel="9" Files="@(Sample-CS-LINQ)" WorkingDirectory="..\Samples\" />
702-
</Target>
703685
<PropertyGroup>
704686
<PreBuildEvent>
705687
</PreBuildEvent>

‎Source/Samples/Sample-CS-EF/Sample.sln‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ EndProject
3737
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Logic", "Logic\Logic.csproj", "{B0A336F4-D904-4040-A0BE-09A620026728}"
3838
EndProject
3939
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Web", "Web\Web.csproj", "{75733A4E-BD54-4929-8535-3B1DC3058899}"
40+
ProjectSection(ProjectDependencies) = postProject
41+
{3BE6A06B-9743-4582-A5DA-68C164192406} = {3BE6A06B-9743-4582-A5DA-68C164192406}
42+
{41F800C7-895F-4160-92FB-B89AF69F363F} = {41F800C7-895F-4160-92FB-B89AF69F363F}
43+
EndProjectSection
4044
EndProject
4145
Project("{00D1A9C2-B5F0-4AF3-8072-F6C62B433612}") = "DatabaseSchema", "Database\DatabaseSchema\DatabaseSchema.sqlproj", "{41F800C7-895F-4160-92FB-B89AF69F363F}"
4246
EndProject

‎Source/Samples/Sample-CS-EF/Web/Web.csproj‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,5 +294,12 @@
294294
<Message Importance="high" Text="Copying source files..." />
295295
<Copy SourceFiles="@(SourceFiles)" DestinationFiles="@(SourceFiles->'$(DestinationPath)%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" OverwriteReadonlyFiles="true" />
296296
<Attrib ReadOnly="true" Files="@(SourceFiles->'$(DestinationPath)%(RecursiveDir)%(Filename)%(Extension)')" />
297+
298+
<ItemGroup>
299+
<Sample-Code Include="..\**\*" Exclude="..\.vs\**;..\**\bin\**;..\**\obj\**;..\**\*.user;..\**\*.suo;..\**\.svn\**;..\**\*.dgen;..\**\*.dbmdl;..\**\*.schemaview;..\**\sql\**;..\**\*.xpr;" />
300+
</ItemGroup>
301+
302+
<Message Importance="high" Text="Archiving sample..."/>
303+
<Zip ZipFileName="..\..\Sample-CS-EF.zip" ZipLevel="9" Files="@(Sample-Code)" WorkingDirectory="..\..\" />
297304
</Target>
298305
</Project>

‎Source/Samples/Sample-CS-LINQ/Sample.sln‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ EndProject
4343
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Logic", "Logic\Logic.csproj", "{B0A336F4-D904-4040-A0BE-09A620026728}"
4444
EndProject
4545
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Web", "Web\Web.csproj", "{75733A4E-BD54-4929-8535-3B1DC3058899}"
46+
ProjectSection(ProjectDependencies) = postProject
47+
{14F75507-A004-4201-A4C5-CBB343DEE68C} = {14F75507-A004-4201-A4C5-CBB343DEE68C}
48+
EndProjectSection
4649
EndProject
4750
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common", "Common\Common.csproj", "{CC0554CB-5F68-4C07-9696-10910BDBDAB1}"
4851
EndProject

‎Source/Samples/Sample-CS-LINQ/Web/Web.csproj‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,5 +298,12 @@
298298
<Message Importance="high" Text="Copying source files..." />
299299
<Copy SourceFiles="@(SourceFiles)" DestinationFiles="@(SourceFiles->'$(DestinationPath)%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" OverwriteReadonlyFiles="true" />
300300
<Attrib ReadOnly="true" Files="@(SourceFiles->'$(DestinationPath)%(RecursiveDir)%(Filename)%(Extension)')" />
301+
302+
<ItemGroup>
303+
<Sample-Code Include="..\**\*" Exclude="..\.vs\**;..\**\bin\**;..\**\obj\**;..\**\*.user;..\**\*.suo;..\**\.svn\**;..\**\*.dgen;..\**\*.dbmdl;..\**\*.schemaview;..\**\sql\**;..\**\*.xpr;" />
304+
</ItemGroup>
305+
306+
<Message Importance="high" Text="Archiving sample..."/>
307+
<Zip ZipFileName="..\..\Sample-CS-LINQ.zip" ZipLevel="9" Files="@(Sample-Code)" WorkingDirectory="..\..\" />
301308
</Target>
302309
</Project>

‎Source/Setup/Client/Client.wxs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,14 +159,14 @@
159159
<ComponentGroup Id="CGSamples" Directory="CGSamplesFolder">
160160
<!--<Component Id="SampleCSEF.zip" Guid="9092528b-f718-4d2f-94c5-03ebf93cb413" Win64="$(var.IsWin64)">
161161
<RegistryValue Root="HKLM" Key="[RegKey]" Type="string" Value="" KeyPath="yes"/>
162-
<File Id="SampleCSEF.zip" Source="$(var.Client.TargetDir)\Samples\Sample-CS-EF.zip">
162+
<File Id="SampleCSEF.zip" Source="$(var.ProjectDir)..\..\Samples\Sample-CS-EF.zip">
163163
<Shortcut Id="CGSamplesSampleCSEFShortcut" Directory="SamplesFolder" Name="C# EF" Icon="Zip.ico"/>
164164
</File>
165165
</Component>-->
166166

167167
<Component Id="SampleCSLINQ.zip" Guid="adf38a9c-23ec-4088-816d-c7725857e050" Win64="$(var.IsWin64)">
168168
<RegistryValue Root="HKMU" Key="[RegKey]" Type="string" Value="" KeyPath="yes"/>
169-
<File Id="SampleCSLINQ.zip" Source="$(var.Client.TargetDir)Samples\Sample-CS-LINQ.zip">
169+
<File Id="SampleCSLINQ.zip" Source="$(var.ProjectDir)..\..\Samples\Sample-CS-LINQ.zip">
170170
<Shortcut Id="CGSamplesSampleCSLINQShortcut" Directory="SamplesFolder" Name="C# LINQ" Icon="Zip.ico"/>
171171
</File>
172172
</Component>

0 commit comments

Comments
 (0)