Skip to content

Commit

Permalink
Fixes for build and code cleanup for git
Browse files Browse the repository at this point in the history
  • Loading branch information
ChrisHammond committed Feb 26, 2016
1 parent 2e8a441 commit b747be0
Show file tree
Hide file tree
Showing 69 changed files with 1,173 additions and 12,899 deletions.
1,054 changes: 1,054 additions & 0 deletions .vs/config/applicationhost.config

Large diffs are not rendered by default.

Binary file modified .vs/dnnsimplearticle/v14/.suo
Binary file not shown.
172 changes: 84 additions & 88 deletions BuildScripts/MSBuild.Community.Tasks.Targets

Large diffs are not rendered by default.

20 changes: 8 additions & 12 deletions BuildScripts/ModulePackage.targets
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<Output TaskParameter="Value" PropertyName="Version" />
</XmlRead>

<!--in VS 2013 we exclude the packages folder -->
<!--in VS 2012 we exclude the packages folder -->
<ItemGroup>
<InstallInclude Include="**\*.ascx" Exclude="packages\**" />
<InstallInclude Include="**\*.asmx" Exclude="packages\**" />
Expand All @@ -23,8 +23,9 @@
<InstallInclude Include="**\*.resx" Exclude="packages\**" />
<InstallInclude Include="**\*.aspx" Exclude="packages\**" />
<InstallInclude Include="**\*.js" Exclude="packages\**" />
<InstallInclude Include="**\*.txt" Exclude="**\obj\**;**\_ReSharper*\**;packages\**;" />
<InstallInclude Include="**\i\**" Exclude="packages\**" />
<InstallInclude Include="**\*.txt" Exclude="**\obj\**;**\_ReSharper*\**;packages\**;**\.git\**;" />
<InstallInclude Include="**\images\**" Exclude="packages\**" />

</ItemGroup>

<ItemGroup>
Expand All @@ -35,11 +36,11 @@
<SourceInclude Include="**\*.html" />
<SourceInclude Include="**\*.htm" />
<SourceInclude Include="**\*.resx" />
<SourceInclude Include="**\*.xml" Exclude="**\bin\**;**\obj\**;**\_ReSharper*\**;" />
<SourceInclude Include="**\*.xml" Exclude="**\obj\**;**\_ReSharper*\**;**\.git\**;" />
<SourceInclude Include="**\*.aspx" />
<SourceInclude Include="**\*.js" />
<SourceInclude Include="**\*.txt" Exclude="**\bin\**;**\obj\**;**\_ReSharper*\**;" />
<SourceInclude Include="**\i\**" />
<SourceInclude Include="**\*.txt" Exclude="**\obj\**;**\_ReSharper*\**;**\.git\**;" />
<SourceInclude Include="**\images\**" />
<SourceInclude Include="**\*.cs" />
<SourceInclude Include="**\Packages\**" />
<SourceInclude Include="**\*.cs.designer" />
Expand All @@ -52,19 +53,14 @@
<Output TaskParameter="Include" ItemName="PackageManifestFiles" />
</CreateItem>

<!--Get all .txt files in the root, license/release and cleanup-->
<CreateItem Include="*.txt">
<Output TaskParameter="Include" ItemName="PackageTxtFiles" />
</CreateItem>
<!--
<CreateItem Include="**\License.txt">
<Output TaskParameter="Include" ItemName="PackageTxtFiles" />
</CreateItem>

<CreateItem Include="**\ReleaseNotes.txt">
<Output TaskParameter="Include" ItemName="PackageTxtFiles" />
</CreateItem>
-->


<CreateItem Include="**\*.sqldataprovider">
<Output TaskParameter="Include" ItemName="SqlDataProviderFiles" />
Expand Down
2 changes: 1 addition & 1 deletion Components/Article.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// Christoc.com - http://www.christoc.com
// Copyright (c) 2014
// Copyright (c) 2014-2016
// by Christoc.com
//
// Originally licensed by
Expand Down
2 changes: 1 addition & 1 deletion Components/ArticleController.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// Christoc.com - http://www.christoc.com
// Copyright (c) 2014
// Copyright (c) 2014-2016
// by Christoc.com
//
// Originally licensed by
Expand Down
Binary file modified Components/FeatureController.cs
Binary file not shown.
2 changes: 1 addition & 1 deletion Components/Taxonomy/Content.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// Christoc.com - http://www.christoc.com
// Copyright (c) 2014
// Copyright (c) 2014-2016
// by Christoc.com
//
// Originally licensed by
Expand Down
2 changes: 1 addition & 1 deletion Components/Taxonomy/Terms.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// Christoc.com - http://www.christoc.com
// Copyright (c) 2014
// Copyright (c) 2014-2016
// by Christoc.com
//
// Originally licensed by
Expand Down
2 changes: 1 addition & 1 deletion Controls/ArticleList.ascx.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// Christoc.com - http://www.christoc.com
// Copyright (c) 2014
// Copyright (c) 2014-2016
// by Christoc.com
//
// Originally licensed by
Expand Down
2 changes: 1 addition & 1 deletion Controls/ArticleView.ascx.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// Christoc.com - http://www.christoc.com
// Copyright (c) 2014
// Copyright (c) 2014-2016
// by Christoc.com
//
// Originally licensed by
Expand Down
Binary file removed DNNSimpleArticle_00.02.02_Install.zip
Binary file not shown.
Binary file modified Data/DataProvider.cs
Binary file not shown.
Binary file modified Edit.ascx.cs
Binary file not shown.
Empty file removed New Text Document.txt
Empty file.
Binary file modified Providers/DataProviders/SqlDataProvider/SqlDataProvider.cs
Binary file not shown.
2 changes: 1 addition & 1 deletion Providers/Sitemap/Sitemap.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// Christoc.com - http://www.christoc.com
// Copyright (c) 2014
// Copyright (c) 2014-2016
// by Christoc.com
//
// Originally licensed by
Expand Down
Binary file removed Resources.zip
Binary file not shown.
171 changes: 0 additions & 171 deletions ResourcesZip/App_LocalResources/Edit.ascx.resx

This file was deleted.

Loading

0 comments on commit b747be0

Please sign in to comment.