Merge branch 'develop'

ennerperez · Jul 3, 2017 · c47ab7b · c47ab7b
2 parents 0f9c1e1 + 3bd72bc
commit c47ab7b
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 34 deletions.
diff --git a/.nuget/NuGet.Config b/.nuget/NuGet.Config
@@ -4,6 +4,6 @@
     <add key="disableSourceControlIntegration" value="true" />
   </solution>
   <packageSources>
-    <add key="local" value="..\Microsoft.Bcl.Build.Symbols\bin\Release" />
+    <add key="local" value="..\Build\Release" />
   </packageSources>
 </configuration>
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.1.24] - [2017-07-02]
+### Fixed
+- Critical missing targets files
+
 ## [1.1.23] - [2017-06-27]
 ### Added
 - Xamarin

diff --git a/Microsoft.Bcl.Build.Symbols/Microsoft.Bcl.Build.Symbols.csproj b/Microsoft.Bcl.Build.Symbols/Microsoft.Bcl.Build.Symbols.csproj
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\NuGet.Packer.1.2.9\build\NuGet.Packer.props" Condition="Exists('..\packages\NuGet.Packer.1.2.9\build\NuGet.Packer.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{A619D960-0942-47BC-B908-F940ECBFA1E1}</ProjectGuid>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Bcl.Build.Symbols</RootNamespace>
     <AssemblyName>Microsoft.Bcl.Build.Symbols</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -25,16 +25,23 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <OutputPath>bin\Debug\</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <OutputPath>bin\Release\</OutputPath>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject />
@@ -44,22 +51,9 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="build\Microsoft.Bcl.Build.Symbols.targets">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="Package.nuspec">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="packages.config" />
+    <None Include="build\Microsoft.Bcl.Build.Symbols.targets" />
+    <None Include="Package.nuspec" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\Microsoft.Bcl.Build.Symbols\build\Microsoft.Bcl.Build.Symbols.targets" Condition="Exists('$(SolutionDir)\Microsoft.Bcl.Build.Symbols\build\Microsoft.Bcl.Build.Symbols.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>Este proyecto hace referencia a los paquetes NuGet que faltan en este equipo. Use la restauración de paquetes NuGet para descargarlos. Para obtener más información, consulte http://go.microsoft.com/fwlink/?LinkID=322105. El archivo que falta es {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\NuGet.Packer.1.2.9\build\NuGet.Packer.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NuGet.Packer.1.2.9\build\NuGet.Packer.props'))" />
-    <Error Condition="!Exists('..\packages\NuGet.Packer.1.2.9\build\NuGet.Packer.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NuGet.Packer.1.2.9\build\NuGet.Packer.targets'))" />
-  </Target>
-  <Import Project="..\packages\NuGet.Packer.1.2.9\build\NuGet.Packer.targets" Condition="Exists('..\packages\NuGet.Packer.1.2.9\build\NuGet.Packer.targets')" />
 </Project>
diff --git a/Microsoft.Bcl.Build.Symbols/packages.config b/Microsoft.Bcl.Build.Symbols/packages.config
diff --git a/build.cake b/build.cake
@@ -2,6 +2,8 @@
 // ARGUMENTS
 //////////////////////////////////////////////////////////////////////
 
+var solution = "./Microsoft.Bcl.Build.Symbols.sln";
+var nuspec = "./Microsoft.Bcl.Build.Symbols/Package.nuspec";
 var target = Argument("target", "Default");
 var configuration = Argument("configuration", "Release");
 var assemblyInfo = ParseAssemblyInfo("./Microsoft.Bcl.Build.Symbols/Properties/AssemblyInfo.cs");
@@ -12,7 +14,7 @@ var version = EnvironmentVariable ("APPVEYOR_BUILD_VERSION") ?? Argument("versio
 //////////////////////////////////////////////////////////////////////
 
 // Define directories.
-var buildDir = Directory("./Microsoft.Bcl.Build.Symbols/bin") + Directory(configuration);
+var buildDir = Directory("../Build/" + configuration);
 
 //////////////////////////////////////////////////////////////////////
 // TASKS
@@ -28,7 +30,7 @@ Task("Restore-NuGet-Packages")
     .IsDependentOn("Clean")
     .Does(() =>
 {
-    NuGetRestore("./Microsoft.Bcl.Build.Symbols.sln");
+    NuGetRestore(solution);
 });
 
 Task("Build")
@@ -39,29 +41,52 @@ Task("Build")
     if(IsRunningOnWindows())
     {
 	  var settings = new MSBuildSettings()
+	  .WithProperty("OutputPath", buildDir)
 	  .WithProperty("PackageVersion", version)
 	  .WithProperty("BuildSymbolsPackage", "false");
 	  settings.SetConfiguration(configuration);
       // Use MSBuild
-      MSBuild("./Microsoft.Bcl.Build.Symbols.sln", settings);
+      MSBuild(solution, settings);
     }
     else
     {
 	  var settings = new XBuildSettings()
+	  .WithProperty("OutputPath", buildDir)
 	  .WithProperty("PackageVersion", version)
 	  .WithProperty("BuildSymbolsPackage", "false");
 	  settings.SetConfiguration(configuration);
       // Use XBuild
-      XBuild("./Microsoft.Bcl.Build.Symbols.sln", settings);
+      XBuild(solution, settings);
     }
 });
 
+Task("Build-NuGet-Packages")
+    .IsDependentOn("Build")
+    .Does(() =>
+    {
+	   var nuGetPackSettings = new NuGetPackSettings()
+	   {
+		OutputDirectory = "Build/" + configuration,
+		IncludeReferencedProjects = false,
+		Id = assemblyInfo.Title,
+		Version = version,
+		Authors = new [] {assemblyInfo.Company},
+		Summary = assemblyInfo.Description,
+		Copyright = assemblyInfo.Copyright,
+		Properties = new Dictionary<string, string>()
+		{
+			{ "Configuration", configuration }
+		}
+	   };
+	   NuGetPack(nuspec, nuGetPackSettings);			 
+    });
+
 //////////////////////////////////////////////////////////////////////
 // TASK TARGETS
 //////////////////////////////////////////////////////////////////////
 
 Task("Default")
-	.IsDependentOn("Build");
+	.IsDependentOn("Build-NuGet-Packages");
 
 //////////////////////////////////////////////////////////////////////
 // EXECUTION