Bump minor version S.SM.P plus many other build updates.

* Bump minor version of System.ServiceModel.Primitives
* Update to latest build tools.
* Update with many changes to shared build files from CoreFx.

Author: StephenBonikowsky

BuildToolsVersion.txt

@@ -1 +1 @@
-1.0.26-prerelease-00809-01
+1.0.26-prerelease-00912-02

Packaging.props

@@ -1,4 +1,4 @@
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <PreReleaseLabel>beta</PreReleaseLabel>
     <PackageDescriptionFile>$(ProjectDir)pkg/descriptions.json</PackageDescriptionFile>
@@ -25,7 +25,7 @@
     <SkipValidatePackageTargetFramework>true</SkipValidatePackageTargetFramework>
   </PropertyGroup>
 
-  <Import Condition="Exists('pkg/baseline/baseline.props')" Project="pkg/baseline/baseline.props" />
+  <Import Condition="Exists('pkg/baseline/baseline.props') AND '$(MSBuildProjectExtension)' == '.pkgproj'" Project="pkg/baseline/baseline.props" />
 
   <PropertyGroup Condition="'$(OsEnvironment)'=='Unix'">
     <!--
@@ -36,8 +36,8 @@
     <SkipBuildPackages>true</SkipBuildPackages>
   </PropertyGroup>
 
-  <!-- Add required legal files to packages -->
   <ItemGroup Condition="'$(MSBuildProjectExtension)' == '.pkgproj'">
+    <!-- Add required legal files to packages -->
     <File Condition="Exists('$(PackageLicenseFile)')"
           Include="$(PackageLicenseFile)" >
         <SkipPackageFileCheck>true</SkipPackageFileCheck>
@@ -46,5 +46,11 @@
           Include="$(PackageThirdPartyNoticesFile)" >
         <SkipPackageFileCheck>true</SkipPackageFileCheck>
     </File>
+
+    <!-- Add version file to packages -->
+    <File Condition="Exists('$(SyncInfoFile)')"
+          Include="$(SyncInfoFile)" >
+        <SkipPackageFileCheck>true</SkipPackageFileCheck>
+    </File>
   </ItemGroup>
 </Project>

UpdatePublishedVersions.ps1

@@ -14,130 +14,13 @@ param(
     [Parameter(Mandatory=$true)][string]$versionsRepo,
     [Parameter(Mandatory=$true)][string]$versionsRepoPath,
     # A pattern matching all packages in the set that the versions repository should be set to.
-    [Parameter(Mandatory=$true)][string]$nupkgPath,
-    # Print out the new file contents, but don't change the versions repository.
-    [switch]$dryRun)
-
-function ConvertPathTo-Package([string]$path)
-{
-    # Find the package ID and version using a regex. This matches the semantic version
-    # and assumes everything to the left is the id or a path to the package directory.
-    $matched = $path -match '^(.*\\)?(.*?)\.(([0-9]+\.)?[0-9]+\.[0-9]+(-([A-z0-9-]+))?)\.(symbols\.)?nupkg$'
-    if ($matched)
-    {
-        $packageInfo = @{
-            Path = $path
-            Name = $matches[2]
-            Version = $matches[3]
-            Prerelease = $matches[6]
-        }
-        $packageInfo.NameVersion = "$($packageInfo.Name) $($packageInfo.Version)"
-        return $packageInfo
-    }
-    else
-    {
-        throw "Couldn't find name and version from path $path."
-    }
-}
-
-# Updates a GitHub file with the specified file contents
-function Update-GitHub-File(
-    [string]$user = $gitHubUser,
-    [string]$email = $gitHubEmail,
-    [string]$authToken = $gitHubAuthToken,
-    [string]$owner = $versionsRepoOwner,
-    [string]$repo = $versionsRepo,
-    [string]$path,
-    [string]$newFileContent,
-    [string]$commitMessage)
-{
-    function message([string]$message)
-    {
-        Write-Host -ForegroundColor Green "*** $message ***"
-    }
-
-    $headers = @{
-        'Accept' = 'application/vnd.github.v3+json'
-        'Authorization' = "token $authToken"
-    }
-
-    $fileUrl = "https://api.github.com/repos/$owner/$repo/contents/$path"
-
-    message "Getting the `"sha`" of the current contents of file '$owner/$repo/$path'"
-
-    $currentFile = Invoke-WebRequest $fileUrl -UseBasicParsing -Headers $headers
-    $currentSha = (ConvertFrom-Json $currentFile.Content).sha
-
-    message "Got `"sha`" value of '$currentSha'"
-
-    message "Request to update file '$owner/$repo/$path' contents to:"
-    Write-Host $newFileContent
-
-    if ($dryRun)
-    {
-        message 'Not sending request: dry run.'
-        return
-    }
-
-    # Base64 encode the string
-    function ToBase64([string]$value)
-    {
-       return [System.Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($value))
-    }
-
-    $updateFileBody = 
-@"
-{
-  "message": "$commitMessage",
-  "committer": {
-    "name": "$user",
-    "email": "$email"
-  },
-  "content": "$(ToBase64 $newFileContent)",
-  "sha": "$currentSha"
-}
-"@
-
-    message 'Sending request...'
-    $putResponse = Invoke-WebRequest $fileUrl -UseBasicParsing -Method PUT -Body $updateFileBody -Headers $headers
-
-    if ($putResponse.StatusCode -ge 200 -and $putResponse.StatusCode -lt 300)
-    {
-        message 'Successfully updated the file'
-    }
-}
-
-# Store result of Get-ChildItem before piping to ConvertPathTo-Package. When directly piping, exceptions are ignored.
-$packagePaths = Get-ChildItem $nupkgPath
-$packages = $packagePaths | %{ ConvertPathTo-Package $_ }
-
-$prereleaseVersion = ''
-foreach ($package in $packages)
-{
-    if ($package.Prerelease)
-    {
-        $prereleaseVersion = $package.Prerelease
-        break
-    }
-}
-
-if (!$prereleaseVersion)
-{
-    throw "Could not find a Prerelease version in '$newPackages'"
-}
-
-$versionFilePath = "$versionsRepoPath/Latest.txt"
-$versionFileContent = "$prereleaseVersion`n"
-
-Update-GitHub-File `
-    -path $versionFilePath `
-    -newFileContent $versionFileContent `
-    -commitMessage "Update '$versionFilePath' with $prereleaseVersion" 
-
-$packageInfoFilePath = "$versionsRepoPath/Latest_Packages.txt"
-$packageInfoFileContent = ($packages | %{ $_.NameVersion } | Sort-Object) -join "`r`n"
-
-Update-GitHub-File `
-    -path $packageInfoFilePath `
-    -newFileContent $packageInfoFileContent `
-    -commitMessage "Adding package info to '$packageInfoFilePath' for $prereleaseVersion" 
+    [Parameter(Mandatory=$true)][string]$nupkgPath)
+
+. "$PSScriptRoot\build-managed.cmd" -- /t:UpdatePublishedVersions `
+    /p:GitHubUser="$gitHubUser" `
+    /p:GitHubEmail="$gitHubEmail" `
+    /p:GitHubAuthToken="$gitHubAuthToken" `
+    /p:VersionsRepoOwner="$versionsRepoOwner" `
+    /p:VersionsRepo="$versionsRepo" `
+    /p:VersionsRepoPath="$versionsRepoPath" `
+    /p:ShippedNuGetPackageGlobPath="$nupkgPath"

build.cmd

@@ -1,4 +1,4 @@
-@if "%_echo%" neq "on" echo off
+@if not defined _echo @echo off
 setlocal
 
 if /I [%1] == [-?] goto Usage

build.proj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <!-- Capture OSGroup passed to command line for setting default FilterToOSGroup value below -->
     <_OriginalOSGroup>$(OSGroup)</_OriginalOSGroup>
@@ -75,6 +75,13 @@
 
   <UsingTask TaskName="GatherDirectoriesToRestore" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll" />
 
+  <!-- Create a collection of all project.json files for dependency updates. -->
+  <ItemGroup>
+    <ProjectJsonFiles Include="$(SourceDir)**/project.json" />
+    <ProjectJsonFiles Include="$(MSBuildThisFileDirectory)pkg/**/project.json" />
+    <ProjectJsonFiles Condition="'$(BuildTestsAgainstPackages)' == 'true'" Include="$(GeneratedProjectJsonDir)/**/project.json" />
+  </ItemGroup>
+  
   <Target Name="BatchRestorePackages" DependsOnTargets="VerifyDependencies">
     <MakeDir Directories="$(PackagesDir)" Condition="!Exists('$(PackagesDir)')" /> 
 

clean.cmd

@@ -1,4 +1,4 @@
-@if "%_echo%" neq "on" echo off
+@if not defined _echo @echo off
 setlocal EnableDelayedExpansion
 
 echo Stop VBCSCompiler.exe execution.
@@ -8,12 +8,17 @@ echo Cleanup StopWcfSelfHostedSvc.cmd
 call src\System.Private.ServiceModel\tools\scripts\StopWcfSelfHostedSvc.cmd
 type SelfHostedWcfServiceCleanup.log
 
-if [%1] == [-all] (
+:: Strip all dashes off the argument and use invariant
+:: compare to match as many versions of "all" that we can
+:: All other argument validation happens inside Run.exe
+set NO_DASHES_ARG=%1
+if not defined NO_DASHES_ARG goto no_args
+if /I [%NO_DASHES_ARG:-=%] == [all] (
   echo Cleaning entire working directory ...
   call git clean -xdf
   exit /b !ERRORLEVEL!
 )
-
+:no_args
 if [%1]==[] set __args=-b
 call %~dp0run.cmd clean %__args% %*
 exit /b %ERRORLEVEL%

config.json

@@ -142,7 +142,7 @@
       "description": "MsBuild logging options.",
       "valueType": "passThrough",
       "values": [],
-      "defaultValue": "/flp:v=normal"
+      "defaultValue": "/flp:v=diag"
     },
     "MsBuildWarning": {
       "description": "MsBuild warning logging.",
@@ -180,12 +180,6 @@
       "values": [],
       "defaultValue": ""
     },
-    "ExtraParameters": {
-      "description": "Extra parameters will be passed to the selected command.",
-      "valueType": "passThrough",
-      "values": [],
-      "defaultValue": ""
-    },
     "BatchGenerateTestProjectJsons": {
       "description": "MsBuild target that generates the project.json files to build tests against packages.",
       "valueType": "target",
@@ -249,8 +243,9 @@
           }
         },
         "tests": {
-          "description": "Builds the tests that are in the repository.",
+          "description": "Builds the tests that are in the repository, doesn't restore packages.",
           "settings": {
+            "RestoreDuringBuild": "false",
             "Project": "src/tests.builds",
             "MsBuildLogging":"/flp:v=normal;LogFile=build-tests.log"
           }
@@ -458,6 +453,7 @@
         }
       },
       "defaultValues": {
+	  	"defaultAlias": "p",
         "toolName": "msbuild",
         "settings": {
           "MsBuildLogging":"/flp:v=normal;LogFile=sync.log"

dependencies.props

@@ -1,4 +1,4 @@
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <!-- Source of truth for dependency tooling: the commit hash of the dotnet/versions master branch as of the last auto-upgrade. -->
   <PropertyGroup>
     <CoreFxCurrentRef>0e5b63ea85c76e944b925a6d3802c84d7e46a9df</CoreFxCurrentRef>
@@ -52,11 +52,11 @@
     </StaticDependency>
 
     <StaticDependency Include="Microsoft.xunit.netcore.extensions;Microsoft.DotNet.BuildTools.TestSuite">
-      <Version>1.0.0-prerelease-00807-03</Version>
+      <Version>1.0.0-prerelease-00830-02</Version>
     </StaticDependency>
 
     <StaticDependency Include="Microsoft.TargetingPack.Private.NETNative">
-      <Version>1.1.0-beta-24509-00</Version>
+      <Version>1.1.0-beta-24607-01</Version>
     </StaticDependency>
 
     <DependencyBuildInfo Include="@(StaticDependency)">