Skip to content
This repository has been archived by the owner on Mar 3, 2020. It is now read-only.

Commit

Permalink
Merge pull request #2 from pvbchak/master
Browse files Browse the repository at this point in the history
Build fixes

1. Cleaning up generated files in respository
2. Version specified in Package.config should not have brackets
3. JS Version in web-dotnet quickstarts should be updated
  • Loading branch information
pvbchak committed Mar 11, 2015
2 parents cc82925 + c933123 commit 7942338
Show file tree
Hide file tree
Showing 19 changed files with 33 additions and 1,146 deletions.
24 changes: 23 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,37 @@ map.txt
*.ldf
obj
*.csproj.user
packages
*.suo
*.xccheckout
deriveddata

# Downloaded files
.nuget
tools-packages
packages

# Copied files
client/dotnet-service
client/web-dotnet/ZUMOAPPNAME/page.tt
client/web-dotnet/ZUMOAPPNAME/styles.css
client/web-dotnet/ZUMOAPPNAME/index.html
client/web-dotnet/ZUMOAPPNAME/index.tt
client/web-dotnet/ZUMOAPPNAME/page.js

# Generated files using *.tt
client/web/index.html
client/web/page.js
client/windows-universal-cs/ZUMOAPPNAME.sln
client/windows-universal-cs/ZUMOAPPNAME/ZUMOAPPNAME.Shared/App.xaml.cs
client/windows-universal-cs/ZUMOAPPNAME/ZUMOAPPNAME.Windows/ZUMOAPPNAME.Windows.csproj
client/windows-universal-cs/ZUMOAPPNAME/ZUMOAPPNAME.Windows/packages.config
client/windows-universal-cs/ZUMOAPPNAME/ZUMOAPPNAME.WindowsPhone/ZUMOAPPNAME.WindowsPhone.csproj
client/windows-universal-cs/ZUMOAPPNAME/ZUMOAPPNAME.WindowsPhone/packages.config
client/windows-universal-js/ZUMOAPPNAME.sln
client/windows-universal-js/ZUMOAPPNAME/ZUMOAPPNAME.Shared/js/default.js
client/windows-universal-js/ZUMOAPPNAME/ZUMOAPPNAME.Windows/packages.config
client/windows-universal-js/ZUMOAPPNAME/ZUMOAPPNAME.WindowsPhone/packages.config
client/xamarin.android/ZUMOAPPNAME.sln
client/xamarin.android/ZUMOAPPNAME/ZUMOAPPNAME.csproj
client/xamarin.iOS/ZUMOAPPNAME.sln
client/xamarin.iOS/ZUMOAPPNAME/ZUMOAPPNAME.csproj
13 changes: 8 additions & 5 deletions Microsoft.WindowsAzure.Mobile.Build.msbuild
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@

</ItemGroup>

<Target Name="BuildQuickStarts">
<Target Name="DownloadSDK">
<!-- Create the Quickstarts directory in bin folder -->
<MakeDir Directories="$(OutputPath)\Quickstarts"/>

Expand Down Expand Up @@ -141,7 +141,9 @@
<Output TaskParameter="NugetVersion" PropertyName="WinJSPackageVersion" />
</GetNugetVersion>
<Message Text="WinJSPackageVersion = $(WinJSPackageVersion)" />

</Target>

<Target Name="BuildQuickStarts">
<!-- Build DotNet service quickstart -->
<MSBuild Projects="$(MSBuildProjectDirectory)\backend\dotnet\Quickstart.csproj"
Properties="Configuration=$(Configuration)"/>
Expand All @@ -152,6 +154,9 @@
<Copy SourceFiles="@(DotNetService)"
DestinationFiles="@(DotNetService->'$(QuickStartsSourceDirectory)\dotnet-service\%(RecursiveDir)%(Filename)%(Extension)')" />

<MSBuild Projects="$(QuickStartsSourceDirectory)\setup\Setup.csproj" Targets="TransformAll"
Properties="Runtime=NODE;ManagedSDKVersion=$(SDKPackageVersion);JSSDKVersion=$(JSSDKVersion);StoreSDKVersion=$(StorePackageVersion);" />

<!-- We don't want to dublicate web QS files so copy them from Node.js runtime QS to NET runtime QS -->
<ItemGroup>
<WebFiles Include="$(QuickStartsSourceDirectory)\web\*.*" />
Expand All @@ -170,8 +175,6 @@
</_BuildQuickStartsNode>
</ItemGroup>

<MSBuild Projects="$(QuickStartsSourceDirectory)\setup\Setup.csproj" Targets="TransformAll"
Properties="Runtime=NODE;ManagedSDKVersion=$(SDKPackageVersion);JSSDKVersion=$(JSSDKVersion);StoreSDKVersion=$(StorePackageVersion);" />
<MSBuild Projects="@(_BuildQuickStartsNode)" Targets="_BuildQuickStartParallel" />

<!-- Execute the private BuildQuickStart task for each quickstart -->
Expand Down Expand Up @@ -243,6 +246,6 @@
</Target>

<!-- Full -->
<Target Name="Full" DependsOnTargets="Clean;BuildQuickStarts;" />
<Target Name="Full" DependsOnTargets="Clean;DownloadSDK;BuildQuickStarts;" />
</Project>

4 changes: 2 additions & 2 deletions backend/dotnet/Quickstart/ZUMOAPPNAMEService/packages.tt
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
foreach(var nugetPackage in this.GetQuickStartTemplates())
{
#>
<package id ="<#= nugetPackage.Id #>" version="[<#= nugetPackage.Version #>]" targetFramework="net45" />
<package id ="<#= nugetPackage.Id #>" version="<#= nugetPackage.Version #>" targetFramework="net45" />
<#
}
#>
<package id="Microsoft.Owin.Host.SystemWeb" version="[2.1.0]" targetFramework="net45" />
<package id="Microsoft.Owin.Host.SystemWeb" version="2.1.0" targetFramework="net45" />
</packages>
<#@ include file="..\..\FindDependentNugets.tt" #>
39 changes: 0 additions & 39 deletions client/web/index.html

This file was deleted.

62 changes: 0 additions & 62 deletions client/web/page.js

This file was deleted.

84 changes: 0 additions & 84 deletions client/windows-universal-cs/ZUMOAPPNAME.sln

This file was deleted.

Loading

0 comments on commit 7942338

Please sign in to comment.