Merge pull request #330 from WindowsAzure/dev

Merge dev into master
Azure · Nov 27, 2013 · b0fbafb · b0fbafb
2 parents f5f8aa4 + 0f2204f
commit b0fbafb
Show file tree

Hide file tree

Showing 65 changed files with 979 additions and 417 deletions.
diff --git a/libraries/Settings.SourceAnalysis b/libraries/Settings.SourceAnalysis
@@ -0,0 +1,185 @@
+<StyleCopSettings Version="105">
+  <GlobalSettings>
+    <StringProperty Name="MergeSettingsFiles">NoMerge</StringProperty>
+  </GlobalSettings>
+  <Analyzers>
+    <Analyzer AnalyzerId="StyleCop.CSharp.DocumentationRules">
+      <Rules>
+        <Rule Name="DocumentationTextMustBeginWithACapitalLetter">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">True</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="DocumentationTextMustEndWithAPeriod">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">True</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="FileMustHaveHeader">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="FileHeaderMustShowCopyright">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="FileHeaderMustHaveCopyrightText">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="FileHeaderMustContainFileName">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="FileHeaderFileNameDocumentationMustMatchFileName">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="FileHeaderMustHaveValidCompanyText">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+      </Rules>
+      <AnalyzerSettings>
+        <StringProperty Name="CompanyName">Microsoft</StringProperty>
+        <StringProperty Name="Copyright">[###LICENSE_NAME###]</StringProperty>
+        <BooleanProperty Name="IgnorePrivates">True</BooleanProperty>
+      </AnalyzerSettings>
+    </Analyzer>
+    <Analyzer AnalyzerId="StyleCop.CSharp.LayoutRules">
+      <Rules>
+        <Rule Name="AllAccessorsMustBeMultiLineOrSingleLine">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="SingleLineCommentsMustNotBeFollowedByBlankLine">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="SingleLineCommentMustBePrecededByBlankLine">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="ElementMustNotBeOnSingleLine">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="ClosingCurlyBracketMustBeFollowedByBlankLine">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+      </Rules>
+      <AnalyzerSettings />
+    </Analyzer>
+    <Analyzer AnalyzerId="StyleCop.CSharp.NamingRules">
+      <Rules>
+        <Rule Name="FieldNamesMustBeginWithLowerCaseLetter">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="FieldNamesMustNotBeginWithUnderscore">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="FieldNamesMustNotContainUnderscore">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+      </Rules>
+      <AnalyzerSettings>
+        <CollectionProperty Name="Hungarian">
+          <Value>as</Value>
+          <Value>do</Value>
+          <Value>id</Value>
+          <Value>if</Value>
+          <Value>in</Value>
+          <Value>is</Value>
+          <Value>my</Value>
+          <Value>no</Value>
+          <Value>on</Value>
+          <Value>to</Value>
+          <Value>ui</Value>
+        </CollectionProperty>
+      </AnalyzerSettings>
+    </Analyzer>
+    <Analyzer AnalyzerId="StyleCop.CSharp.OrderingRules">
+      <Rules>
+        <Rule Name="UsingDirectivesMustBePlacedWithinNamespace">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="ElementsMustAppearInTheCorrectOrder">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="ElementsMustBeOrderedByAccess">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="StaticElementsMustAppearBeforeInstanceElements">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="DeclarationKeywordsMustFollowOrder">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="ProtectedMustComeBeforeInternal">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+      </Rules>
+      <AnalyzerSettings />
+    </Analyzer>
+    <Analyzer AnalyzerId="StyleCop.CSharp.ReadabilityRules">
+      <Rules>
+        <Rule Name="PrefixLocalCallsWithThis">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="ParameterMustNotSpanMultipleLines">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="BlockStatementsMustNotContainEmbeddedRegions">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="CommentsMustContainText">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="PrefixCallsCorrectly">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+      </Rules>
+      <AnalyzerSettings />
+    </Analyzer>
+  </Analyzers>
+</StyleCopSettings>
diff --git a/libraries/WindowsAzureLibraries.sln b/libraries/WindowsAzureLibraries.sln
@@ -29,12 +29,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{D93C94DB-270A-46A0-AF68-C58B99B9A4D2}"
 	ProjectSection(SolutionItems) = preProject
 		libraries.msbuild = libraries.msbuild
-		src\library.props = src\library.props
 		src\library.targets = src\library.targets
-		src\references.net40.props = src\references.net40.props
-		src\references.net45.props = src\references.net45.props
-		src\references.portable.props = src\references.portable.props
-		src\references.props = src\references.props
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{7C044DD1-F76B-49A7-A8DF-A5DEEE748EBB}"
@@ -43,22 +38,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{7C044DD1-F
 		WindowsAzureLibraries.vsmdi = WindowsAzureLibraries.vsmdi
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "nuget specifications", "nuget specifications", "{459B8C99-5EC0-43A6-9BAD-1A9E6191D948}"
-	ProjectSection(SolutionItems) = preProject
-		src\PackageSpecs\Microsoft.WindowsAzure.Common.Dependencies.nuspec = src\PackageSpecs\Microsoft.WindowsAzure.Common.Dependencies.nuspec
-		src\PackageSpecs\Microsoft.WindowsAzure.Common.nuspec = src\PackageSpecs\Microsoft.WindowsAzure.Common.nuspec
-		src\PackageSpecs\Microsoft.WindowsAzure.ConfigurationManager.nuspec = src\PackageSpecs\Microsoft.WindowsAzure.ConfigurationManager.nuspec
-		src\PackageSpecs\Microsoft.WindowsAzure.Management.Compute.nuspec = src\PackageSpecs\Microsoft.WindowsAzure.Management.Compute.nuspec
-		src\PackageSpecs\Microsoft.WindowsAzure.Management.Libraries.nuspec = src\PackageSpecs\Microsoft.WindowsAzure.Management.Libraries.nuspec
-		src\PackageSpecs\Microsoft.WindowsAzure.Management.Monitoring.nuspec = src\PackageSpecs\Microsoft.WindowsAzure.Management.Monitoring.nuspec
-		src\PackageSpecs\Microsoft.WindowsAzure.Management.nuspec = src\PackageSpecs\Microsoft.WindowsAzure.Management.nuspec
-		src\PackageSpecs\Microsoft.WindowsAzure.Management.Scheduler.nuspec = src\PackageSpecs\Microsoft.WindowsAzure.Management.Scheduler.nuspec
-		src\PackageSpecs\Microsoft.WindowsAzure.Management.Storage.nuspec = src\PackageSpecs\Microsoft.WindowsAzure.Management.Storage.nuspec
-		src\PackageSpecs\Microsoft.WindowsAzure.Management.VirtualNetworks.nuspec = src\PackageSpecs\Microsoft.WindowsAzure.Management.VirtualNetworks.nuspec
-		src\PackageSpecs\Microsoft.WindowsAzure.Management.WebSites.nuspec = src\PackageSpecs\Microsoft.WindowsAzure.Management.WebSites.nuspec
-		src\PackageSpecs\NuGetSpecs.proj = src\PackageSpecs\NuGetSpecs.proj
-	EndProjectSection
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SchedulerManagement", "src\SchedulerManagement\SchedulerManagement.csproj", "{A3FD3224-3058-48CC-961F-E89D5DCB028D}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Configuration", "src\Configuration\Configuration.csproj", "{8FF949EE-73BD-48BF-ABDF-A6711E573FDF}"
@@ -71,6 +50,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "git", "git", "{EAC2DE24-42C
 		..\README.md = ..\README.md
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "product", "product", "{CECF3E21-0555-4C3C-B736-547D95A6E434}"
+	ProjectSection(SolutionItems) = preProject
+		src\Microsoft.WindowsAzure.Management.Libraries.nuget.proj = src\Microsoft.WindowsAzure.Management.Libraries.nuget.proj
+		src\Microsoft.WindowsAzure.Management.Libraries.nuspec = src\Microsoft.WindowsAzure.Management.Libraries.nuspec
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

diff --git a/libraries/libraries.msbuild b/libraries/libraries.msbuild
@@ -6,28 +6,11 @@
     <ProductFriendlyName>Windows Azure Management Libraries</ProductFriendlyName>
     <ProductSourceFolder>$(MSBuildThisFileDirectory)src</ProductSourceFolder>
   </PropertyGroup>
-  <!--
-  Windows Azure Libraries Versioning
-  - - -
-  We version the baseline Common library in general and assume that early on,
-  there will not be much divergence. As Windows Azure is a service, over time
-  there will be some level of new functionality, breaking changes, and as a
-  result will be using SemVer to version independent components as appropriate.
-  
-  To enable nightly builds with NuGet packages, at runtime this baseline may
-  be altered in specification files to enable the proper update experience in
-  such feeds.
-  
-  The release notes can also use token replacement to share common information.
-  -->
-  <PropertyGroup>
-    <BaselineReleaseNotes>PREVIEW RELEASE</BaselineReleaseNotes>
-  </PropertyGroup>
 
   <!--
-  NuGet Package Specifications
+  NuGet Packages
   -->
-  <Import Project="$(ProductSourceFolder)\PackageSpecs\NuGetSpecs.proj" />
+  <Import Project="nuget.targets" />
 
   <!--
   Windows Azure Management Libraries SDK Builder Guide
@@ -98,13 +81,9 @@
   </PropertyGroup>
 
   <!--
-  General NuGet packaging properties
+  Build version parameters
   -->
   <PropertyGroup>
-    <NuGetCommand>.nuget\NuGet.exe</NuGetCommand>
-    <PackageOutputDir>binaries\packages</PackageOutputDir>
-    <NuGetVerbosity>normal</NuGetVerbosity>
-    <PublishSymbolSourcePackages>true</PublishSymbolSourcePackages>
     <BuildVersionSuffix></BuildVersionSuffix>
     <AdditionalVersionSuffix></AdditionalVersionSuffix>
   </PropertyGroup>
@@ -217,49 +196,7 @@
       <Output PropertyName="BuildVersionSuffix" TaskParameter="Value" />
     </CreateProperty>
   </Target>
-
-  <!--
-  Build NuGet packages
-  -->
-  <Target Name="BuildPackages">
-    <MakeDir Directories="binaries" Condition="!Exists('binaries')" />
-    <RemoveDir Directories="binaries\packages" Condition="Exists('binaries\packages')" ContinueOnError="true" />
-    <MakeDir Directories="binaries\packages" Condition="!Exists('binaries\packages')" />
-
-    <Message Text="Generating NuGet library &amp; symbols + source packages" Importance="high" />
-    <Exec Condition=" '%(SdkNuGetPackage.SkipSymbolSourcePackage)' != 'true' "
-          Command="$(NuGetCommand) pack -BasePath .\src\ -Verbosity $(NuGetVerbosity) &quot;src\PackageSpecs\%(SdkNuGetPackage.Identity).nuspec&quot; -Version %(SdkNuGetPackage.PackageVersion)$(BuildVersionSuffix)$(AdditionalVersionSuffix) -OutputDirectory &quot;$(PackageOutputDir)&quot; -Symbols" />
-
-    <Message Text="Generating NuGet packages without symbol + source packages" Importance="high" />
-    <Exec Condition=" '%(SdkNuGetPackage.SkipSymbolSourcePackage)' == 'true' "
-          Command="$(NuGetCommand) pack -BasePath .\src\ -Verbosity $(NuGetVerbosity) &quot;src\PackageSpecs\%(SdkNuGetPackage.Identity).nuspec&quot; -Version %(SdkNuGetPackage.PackageVersion)$(BuildVersionSuffix)$(AdditionalVersionSuffix) -OutputDirectory &quot;$(PackageOutputDir)&quot;" />
-  </Target>
 
-  <Target Name="PublishPackagesOnly">
-    <Error Condition=" '$(NuGetKey)' == '' " Text="You must provide the NuGetKey parameter to the build: /p:NuGetKey=YOUR_PUBLISHING_KEY" />
-
-    <PropertyGroup>
-      <ActualSource Condition=" '$(NuGetPublishingSource)' == '' "></ActualSource>
-      <ActualSource Condition=" '$(NuGetPublishingSource)' != '' "> -Source $(NuGetPublishingSource)</ActualSource>
-    </PropertyGroup>
-
-    <Message Importance="high" Text="Publishing NuGet packages to the cloud at $(NuGetPublishingSource)" />
-    <Exec Command="$(NuGetCommand) push &quot;$(PackageOutputDir)\%(SdkNuGetPackage.Identity).%(SdkNuGetPackage.PackageVersion)$(BuildVersionSuffix)$(AdditionalVersionSuffix).nupkg&quot; $(NuGetKey)$(ActualSource)"
-          Condition=" '%(SdkNuGetPackage.Publish)' != 'false' " />
-
-    <Message Importance="high" Text="Publishing NuGet symbol &amp; source packages to the cloud at $(NuGetSymbolPublishingSource)" 
-             Condition=" $(NuGetSymbolPublishingSource) != '' "/>
-    <Exec Command="$(NuGetCommand) push &quot;$(PackageOutputDir)\%(SdkNuGetPackage.Identity).%(SdkNuGetPackage.PackageVersion)$(BuildVersionSuffix)$(AdditionalVersionSuffix).Symbols.nupkg&quot; $(NuGetKey) -Source $(NuGetSymbolPublishingSource)" 
-          Condition=" $(NuGetSymbolPublishingSource) != '' And '%(SdkNuGetPackage.Publish)' != 'false' And '%(SdkNuGetPackage.SkipSymbolSourcePackage)' != 'true' And '$(PublishSymbolSourcePackages)' == 'true' " 
-          ContinueOnError="true" />
-
-    <Message Text="Not publishing package %(SdkNuGetPackage.Identity) as Publish is set to 'false' for the component."
-             Condition=" '%(SdkNuGetPackage.Publish)' == 'false' " />
-
-    <Warning Text="Symbol/source packages are not being pushed. The PublishSymbolSourcePackages property is not set to true." 
-             Condition=" '$(PublishSymbolSourcePackages)' != 'true' " />
-  </Target>
-
   <!--
   Perform an on-premise official build server drop of this project. Sign the
   generated binaries, build officially-versioned packages, perform compliance
@@ -421,9 +358,6 @@
   If you accidentally run this within your enlistment, revert AssemblyInfo.cs
   changes before commiting to Git.
   -->
-  <PropertyGroup>
-    <BaselineReleaseNotesReplacementToken>__BASELINE_RELEASE_NOTES__</BaselineReleaseNotesReplacementToken>
-  </PropertyGroup>
   <Target Name="BurnBuildVersions"
           DependsOnTargets="GetGeneratedBuildDate">
     <Message Text="Destructive burn of assembly file versions to include the build number in the revision component." />
@@ -439,18 +373,5 @@
                           NuGet semver for each assembly along with the build
                           information, but this would require refactoring the
                           build item groups. -->
-
-    <Message Text="Destructive burn of NuGet dependency versions in .nuspec files." />
-    <ItemGroup>
-      <NuspecFilesToUpdate Include="$(ProductSourceFolder)\**\Microsoft.WindowsAzure.*.nuspec" />
-    </ItemGroup>
-    <RegexReplacementTask Files="@(NuspecFilesToUpdate)"
-                          Find="__VERSION_%(SdkNuGetPackage.Identity)__"
-                          Replace="%(SdkNuGetPackage.PackageVersion)$(BuildVersionSuffix)$(AdditionalVersionSuffix)"
-                          LogReplacement="true" />
-    <RegexReplacementTask Files="@(NuspecFilesToUpdate)"
-                          Find="__BASELINE_RELEASE_NOTES__"
-                          Replace="$(BaselineReleaseNotes)"
-                          LogReplacement="true" />
   </Target>
 </Project>