CoreBuild: build agent NuGet

Agents/Xamarin.Interactive/Xamarin.Interactive.csproj

@@ -1,21 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
  <PropertyGroup>
  <TargetFramework>netstandard2.0</TargetFramework>
- </PropertyGroup>
-
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
  <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
  </PropertyGroup>
-
- <ItemGroup>
- <Compile Remove="API\Xamarin.Interactive.api.cs" />
- </ItemGroup>
- <ItemGroup>
- <None Include="API\Xamarin.Interactive.api.cs" />
- </ItemGroup>
  <Import Project="..\..\build\Project.targets" />
-</Project>
+ <Target Name="Package" Condition="Exists('$(MonoCilStrip)')">
+ <Exec Command="$(MonoCilStrip) &quot;$(OutputPath)$(AssemblyName).dll&quot; &quot;$(OutputPath)$(AssemblyName).Stripped.dll&quot;" />
+ <Exec Command="$(NuGet) pack Xamarin.Interactive.nuspec -Version $(WorkbooksIntegrationNuGetPackageVersion) -OutputDirectory &quot;$(ArtifactsBasePath)&quot; -Properties Configuration=$(Configuration)" />
+ </Target>
+</Project>

Build.proj

@@ -20,9 +20,6 @@
  <WrenchAdb>C:\Users\builder\AppData\Local\Android\android-sdk\platform-tools\adb.exe</WrenchAdb>
  <SevenZip>C:\Program Files\7-zip\7z.exe</SevenZip>
  </PropertyGroup>
- <PropertyGroup Condition="'$(SolutionPlatform)' == 'macOS'">
- <CILStrip>/Library/Frameworks/Mono.framework/Versions/Current/Commands/mono-cil-strip</CILStrip>
- </PropertyGroup>
 
  <ItemGroup>
  <WhichSearchPath Include="$(MSBuildThisFileDirectory)"/>
@@ -130,24 +127,10 @@
  SourceFiles="$(BuildInfoDistFile)"
  DestinationFolder="$(PackageOutputDir)"/>
  <Message Text="Generated $(PackageOutputDir)buildinfo" Importance="high"/>
- <CallTarget Targets="PackageNuGet" Condition="'$(SolutionPlatform)' == 'macOS'"/>
  <CallTarget Targets="_PackageInspectorNuGetWin" Condition="'$(SolutionPlatform)' == 'Windows'"/>
  <CallTarget Targets="GenerateReleaseNotes" Condition="'$(SolutionPlatform)' == 'macOS'"/>
  </Target>
 
- <Target Name="PackageNuGet">
- <PropertyGroup>
- <AgentPcl>$(MSBuildThisFileDirectory)Agents\Xamarin.Interactive\bin\$(Configuration)\netstandard2.0\Xamarin.Interactive.dll</AgentPcl>
- <StrippedPcl>$(MSBuildThisFileDirectory)Agents\Xamarin.Interactive\bin\$(Configuration)\netstandard2.0\Xamarin.Interactive.Stripped.dll</StrippedPcl>
- </PropertyGroup>
- <Exec Command="$(CILStrip) &quot;$(AgentPcl)&quot; &quot;$(StrippedPcl)&quot;"/>
- <Error Text="NuGet is not provisioned" Condition="!Exists('$(NuGet)')"/>
- <Exec Command="$(NuGet) pack Xamarin.Interactive.nuspec -Version $(WorkbooksIntegrationNuGetPackageVersion) -Properties Configuration=$(Configuration)" WorkingDirectory="Agents\Xamarin.Interactive" />
- <Copy
- SourceFiles="Agents\Xamarin.Interactive\Xamarin.Workbooks.Integration.$(WorkbooksIntegrationNuGetPackageVersion).nupkg"
- DestinationFiles="$(PackageOutputDir)\Xamarin.Workbooks.Integration.$(WorkbooksIntegrationNuGetPackageVersion).nupkg" />
- </Target>
-
  <Target Name="_PackageInspectorNuGetWin">
  <PropertyGroup>
  <InspectorClientFilesPath>Clients\Xamarin.Interactive.Client.Windows\bin\$(Configuration)\Inspector\</InspectorClientFilesPath>

CoreBuild.proj

@@ -7,6 +7,8 @@
  <ReleaseVersion_SemVer>2.0.0-dev</ReleaseVersion_SemVer>
  <CommonGitInfo_SetMinRevisionFromMostRecentTagRegex>true</CommonGitInfo_SetMinRevisionFromMostRecentTagRegex>
  <CommonGitInfo_MostRecentTagRegex>^v\d+</CommonGitInfo_MostRecentTagRegex>
+
+ <WorkbooksIntegrationNuGetPackageVersion>2.0.0-rc1</WorkbooksIntegrationNuGetPackageVersion>
  </PropertyGroup>
 
  <!-- Profiles -->
@@ -60,6 +62,7 @@
  <ItemGroup>
  <ProjectsToBuild Include="Agents\Xamarin.Interactive\*.csproj">
  <HasPublicApi>true</HasPublicApi>
+ <HasPackageTarget>true</HasPackageTarget>
  </ProjectsToBuild>
  <ProjectsToBuild Include="CodeAnalysis\Xamarin.Interactive.CodeAnalysis\*.csproj">
  <HasPublicApi>true</HasPublicApi>
@@ -257,6 +260,9 @@
  <PropertiesToPersist Include="Profile">
  <Value>$(Profile)</Value>
  </PropertiesToPersist>
+ <PropertiesToPersist Include="WorkbooksIntegrationNuGetPackageVersion">
+ <Value>$(WorkbooksIntegrationNuGetPackageVersion)</Value>
+ </PropertiesToPersist>
  </ItemGroup>
 
  <UpdateMSBuildProject

build/Environment.props

@@ -37,8 +37,10 @@
  </PropertyGroup>
 
  <PropertyGroup>
+ <MonoInstallRootDirectory Condition="$(IsMac)">$([MSBuild]::NormalizeDirectory('/Library/Frameworks/Mono.framework/Versions/Current'))</MonoInstallRootDirectory>
  <HaveMono Condition="'$(HaveMono)' == ''">false</HaveMono>
- <HaveMono Condition="$(IsMac) And Exists('/Library/Frameworks/Mono.framework/Versions/Current/VERSION')">true</HaveMono>
+ <HaveMono Condition="'$(MonoInstallRootDirectory)' != '' And Exists('$(MonoInstallRootDirectory)VERSION')">true</HaveMono>
+ <MonoCilStrip Condition='$(HaveMono)'>$(MonoInstallRootDirectory)Commands/mono-cil-strip</MonoCilStrip>
 
  <HaveXamarinMac Condition="'$(HaveXamarinMac)' == ''">false</HaveXamarinMac>
  <HaveXamarinMac Condition="$(IsMac) And Exists('/Library/Frameworks/Xamarin.Mac.framework/Versions/Current/Version')">true</HaveXamarinMac>