CoreBuild → Build

.appveyor.yml

@@ -9,12 +9,9 @@ cache:
 - node_modules
 - '%USERPROFILE%\.nuget\packages'
 build_script:
-- cmd: msbuild Build.proj /p:Configuration=Release /t:UpdateBuildInfo,Build,Package
+- cmd: msbuild build.proj /p:Configuration=Release /t:UpdateBuildInfo,Restore,Build,Package
 test_script:
-- cmd: >-
- msbuild Build.proj /t:TestRegressions /p:Configuration=Release
-
- msbuild CoreBuild.proj /t:Restore,Build,Test /p:Configuration=Release /p:Profile=Core /p:SkipDesktopTests=true
+- cmd: msbuild build.proj /t:Test
 artifacts:
 - path: _artifacts\*.msi
  name: Installer

.travis.yml

@@ -12,6 +12,6 @@ cache:
  yarn: true
 
 script:
-- dotnet build CoreBuild.proj
-- dotnet msbuild CoreBuild.proj /t:Test
-- dotnet msbuild CoreBuild.proj /t:Package
+- dotnet build build.proj
+- dotnet msbuild build.proj /t:Test
+- dotnet msbuild build.proj /t:Package

.vsts-ci.yml

@@ -33,30 +33,27 @@ steps:
 
 - task: MSBuild@1
  inputs:
- solution: CoreBuild.proj
+ solution: build.proj
  configuration: '$(msbuild.configuration)'
  msbuildArguments: '/t:Restore /p:Profile=$(msbuild.buildProfile)'
  displayName: Restore
 
 - task: MSBuild@1
  inputs:
- solution: CoreBuild.proj
- configuration: '$(msbuild.configuration)'
- msbuildArguments: '/t:Build /p:Profile=$(msbuild.buildProfile)'
+ solution: build.proj
+ msbuildArguments: '/t:Build'
  displayName: Build
 
 - task: MSBuild@1
  inputs:
- solution: CoreBuild.proj
- configuration: '$(msbuild.configuration)'
- msbuildArguments: '/t:Package /p:Profile=$(msbuild.buildProfile)'
+ solution: build.proj
+ msbuildArguments: '/t:Package'
  displayName: Package
 
 - task: MSBuild@1
  inputs:
- solution: CoreBuild.proj
- configuration: '$(msbuild.configuration)'
- msbuildArguments: '/t:ArchiveSymbolFiles /p:Profile=$(msbuild.buildProfile)'
+ solution: build.proj
+ msbuildArguments: '/t:ArchiveSymbolFiles'
  displayName: Archive Symbol Files
 
 - task: PublishBuildArtifacts@1
@@ -68,9 +65,8 @@ steps:
 
 - task: MSBuild@1
  inputs:
- solution: CoreBuild.proj
- configuration: '$(msbuild.configuration)'
- msbuildArguments: '/t:Test /p:Profile=$(msbuild.buildProfile)'
+ solution: build.proj
+ msbuildArguments: '/t:Test'
  displayName: Run xUnit Tests
 
 - task: PublishTestResults@2

Clients/Xamarin.Interactive.Client.Mac/Package.targets

@@ -1,8 +1,5 @@
 <Project>
  <PropertyGroup>
- <TopDirectory>..\..\</TopDirectory>
- <AbsoluteTopDirectory>$(MSBuildThisFileDirectory)$(TopDirectory)</AbsoluteTopDirectory>
-
  <PackageAssetsDirectory>PackageAssets\</PackageAssetsDirectory>
 
  <InstallDestDir Condition="'$(InstallDestDir)' == ''">_install\</InstallDestDir>

Clients/Xamarin.Interactive.Client.Mac/Xamarin.Interactive.Client.Mac.csproj

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="..\..\build\Project.targets" />
  <PropertyGroup>
  <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
  <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -412,7 +413,6 @@
  </ItemGroup>
  <Import Project="..\Xamarin.Interactive.MTouch\Xamarin.Interactive.MTouch.projitems" Label="Shared" Condition="Exists('..\Xamarin.Interactive.MTouch\Xamarin.Interactive.MTouch.projitems')" />
  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
- <Import Project="..\..\build\Project.targets" />
  <Import Project="Build.targets" />
  <Import Project="Package.targets" />
  <ItemGroup>

Clients/Xamarin.Interactive.Client.Windows/Build.targets

@@ -1,7 +1,6 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="$(MSBuildThisFileDirectory)..\Xamarin.Interactive.Client\ClientApp\WebApp.targets" />
  <Import Project="$(MSBuildThisFileDirectory)..\SharedClientResources.targets" />
- <Import Project="$(MSBuildThisFileDirectory)..\..\build\Project.targets" />
 
  <PropertyGroup>
  <ClientAppResourcesOutputPath>$(OutputPath)</ClientAppResourcesOutputPath>

Clients/Xamarin.Interactive.Client.Windows/Xamarin.Interactive.Client.Windows.csproj

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+ <Import Project="..\..\build\Project.targets" />
  <PropertyGroup>
  <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
  <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

Package/Windows/Xamarin.Interactive.Windows.Installer.wixproj

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="..\..\build\Project.targets" />
  <PropertyGroup>
  <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
  <Platform Condition=" '$(Platform)' == '' ">x86</Platform>

CoreBuild.proj → build.proj

@@ -158,9 +158,11 @@
  <Target
  Name="Build"
  DependsOnTargets="@(ProfileTargets)">
+ <Exec Condition="$(IsWindows) And Exists('$(Adb)')" Command="$(Adb) kill-server"/>
+ <Exec Condition="$(IsMac)" Command="xcrun -k"/>
  <MSBuild
  Projects="$(SolutionFile)"
- Properties="$(ProfileProperties)"
+ Properties="$(SolutionGlobalProperties)"
  Targets="Build"/>
  </Target>
 
@@ -170,7 +172,7 @@
  <Message Importance="High" Text="Restoring NuGet packages for $(SolutionFileRelative)..."/>
  <MSBuild
  Projects="$(SolutionFile)"
- Properties="$(ProfileProperties)"
+ Properties="$(SolutionGlobalProperties)"
  Targets="Restore"/>
  </Target>
 
@@ -210,7 +212,7 @@
  </ItemGroup>
  <MSBuild
  Projects="@(PackageProjectsToBuild)"
- Properties="$(ProfileProperties);WorkbookAppsBasePath="
+ Properties="$(SolutionGlobalProperties)"
  Targets="Package"/>
  </Target>
 
@@ -309,6 +311,8 @@
  <SolutionFile>$(MSBuildThisFileDirectory)solutions\Xamarin.Interactive.sln</SolutionFile>
  <SolutionFileRelative>$([MSBuild]::MakeRelative($(MSBuildThisFileDirectory), $(SolutionFile)))</SolutionFileRelative>
  <SolutionBasePath>$([System.IO.Path]::GetDirectoryName($(SolutionFile)))\</SolutionBasePath>
+
+ <SolutionGlobalProperties>Configuration=$(Configuration)</SolutionGlobalProperties>
  </PropertyGroup>
  </Target>
 
@@ -430,4 +434,14 @@
  HtmlOutputFile="$(ArtifactsBasePath)updater-release-notes-$(ReleaseVersion_SemVer).html" />
  </Target>
 
+ <Target
+ Name="UpdatePublicApiDocs"
+ DependsOnTargets="UpdatePublicApiDefinitions">
+ <Exec Command="mdoc update --delete Agents\Xamarin.Interactive\bin\Release\netstandard2.0\Xamarin.Interactive.dll -out Agents\Xamarin.Interactive\API\en -r /Library/Frameworks/Mono.framework/Versions/Current/lib/mono/4.5/Facades/netstandard.dll"/>
+ </Target>
+
+ <Target
+ Name="AssemblePublicApiDocs">
+ <Exec Command="mdoc assemble -o Agents\Xamarin.Interactive\API\interactive-api Agents\Xamarin.Interactive\API\en"/>
+ </Target>
 </Project>

build/Environment.props

@@ -59,12 +59,26 @@
  <WhichSearchPath Include="$(Provisionator_ArtifactCachePath)"/>
  </ItemGroup>
 
+ <PropertyGroup Condition="'$(TF_BUILD)' == 'True'">
+ <MacBuildHostAddress Condition="'$(AGENT_NAME)' == 'RE Cambridge Windows-Inspector-1'">bockover-1.guest.corp.microsoft.com</MacBuildHostAddress>
+ <MacBuildHostAddress Condition="'$(AGENT_NAME)' == 'Cambridge Windows-Inspector-2'">inspector-1.guest.corp.microsoft.com</MacBuildHostAddress>
+ <MacBuildHostUser>builder</MacBuildHostUser>
+ <Adb Condition="Exists('$(UserProfile)\AppData\Local\Android\android-sdk\platform-tools\adb.exe')">$(UserProfile)\AppData\Local\Android\android-sdk\platform-tools\adb.exe</Adb>
+ </PropertyGroup>
+
+ <PropertyGroup>
+ <SevenZip Condition="Exists('C:\Program Files\7-zip\7z.exe')">C:\Program Files\7-zip\7z.exe</SevenZip>
+ </PropertyGroup>
+
  <ItemGroup>
  <ConfigurationSummary Include="Host Environment:"/>
  <ConfigurationSummary Include="%20%20Host RID Base: $(RuntimeIdentifierPlatformBase)"/>
  <ConfigurationSummary Include="%20%20.NET Core MSBuild: $(IsDotNetCoreMSBuild)"/>
  <ConfigurationSummary Include="%20%20MSBuildBinPath: $(MSBuildBinPath)"/>
  <ConfigurationSummary Include="%20%20MSBuildExtensionsPath: $(MSBuildExtensionsPath)"/>
+ <ConfigurationSummary Condition="'$(MacBuildHostAddress)' != ''" Include="%20%20MacBuildHostAddress: $(MacBuildHostAddress)"/>
+ <ConfigurationSummary Condition="'$(MacBuildHostUser)' != ''" Include="%20%20MacBuildHostAddress: $(MacBuildHostUser)"/>
+ <ConfigurationSummary Condition="'$(Adb)' != ''" Include="%20%20Adb: $(Adb)"/>
  <ConfigurationSummary Include="%20%20Available SDKs/Frameworks:"/>
  <ConfigurationSummary Include="%20%20%20%20Mono: $(HaveMono)"/>
  <ConfigurationSummary Include="%20%20%20%20Xamarin.Mac: $(HaveXamarinMac)"/>

build/Utility.targets

@@ -1,16 +1,4 @@
-<!--
-Utility.targets
-
-Author:
- Aaron Bockover <[email protected]>
-
-Copyright 2017 Microsoft. All rights reserved.
--->
-<Project
- xmlns="http://schemas.microsoft.com/developer/msbuild/2003"
- DefaultTargets="Build"
- ToolsVersion="12.0">
-
+<Project>
  <Target
  Name="UpdateInvertedDependencies"
  AfterTargets="Build">
@@ -129,9 +117,7 @@ Copyright 2017 Microsoft. All rights reserved.
  </Target>
 
  <Target
- Name="GenerateSignFiles"
- Condition="$(IsWindows)"
- AfterTargets="Build">
+ Name="GenerateSignFiles">
  <MakeDir Directories="$(ArtifactsBasePath)"/>
  <ItemGroup>
  <SignTarget Include="Agents\**\Xamarin*.dll"/>
@@ -155,7 +141,6 @@ Copyright 2017 Microsoft. All rights reserved.
  <PropertyGroup>
  <SignTargetPath>$(ArtifactsBasePath)sign-target.txt</SignTargetPath>
  <SignArchiveName>sign-$(CommongitInfo_MaxRevisionShort).zip</SignArchiveName>
- <SevenZip>C:\Program Files\7-zip\7z.exe</SevenZip>
  </PropertyGroup>
  <WriteLinesToFile Lines="@(SignTarget)" File="$(SignTargetPath)" Overwrite="true"/>
  <Exec Command="&quot;$(SevenZip)&quot; a &quot;$(SignArchiveName)&quot; %40$(SignTargetPath)" ConsoleToMSBuild="true" />
@@ -170,7 +155,6 @@ Copyright 2017 Microsoft. All rights reserved.
  <Message Importance="High" Text="Downloading Authenticode-signed .zip from $(SignedArchiveName)" />
  <Error Text="Cannot download signed file, missing SignedArchiveName property." Condition=" '$(SignedArchiveName)' == '' " />
 
- <!-- $(PowerShell) is defined the same way as $(SevenZip) -->
  <Exec Command="&quot;$(PowerShell)&quot; -Command &quot;&amp; { Invoke-WebRequest -UseBasicParsing -OutFile $(SignArchiveName) $(SignedArchiveName) }&quot;"
  Condition=" '$(SignedArchiveName)' != '' "/>
  <Exec Command="&quot;$(SevenZip)&quot; x -aoa $(SignArchiveName)" Condition=" Exists('$(SignArchiveName)') " />