Update baseline infra with specifics for deployment-tools repo #1

NikolaMilosavljevic · 2020-06-24T15:20:38Z

Changes in infra specific to deployment-tools repo and projects it would build.

Includes some initial changes in Readme and Contributing files - more changes will come in next PR.

azure-pipelines.yml

dagood · 2020-06-29T14:43:04Z

eng/Signing.props

-    <ItemGroup Condition="'$(SignR2RBinaries)' == 'true'">
-      <ItemsToSign Include="$(CrossGenRootPath)**/*.dll" />
+      <!-- Sign ClickOnce binaries. -->
+      <!--ItemsToSign Include="$(ArtifactsBinDir)Mage/**/*.dll" /-->


eng/Subsets.props

dagood · 2020-06-29T14:49:53Z

eng/Subsets.props

-    <SubsetName Include="Installer.Managed" Description="The managed .NET hosting projects. This includes HostModel." />
-    <SubsetName Include="Installer.DepProjs" Description="The dependency projects. These gather shared framework files and run crossgen on them to turn them into ready-to-run (R2R) assemblies for the current platform." />
-    <SubsetName Include="Installer.PkgProjs" Description="The packaging projects. These produce NETCoreApp assets: NuGet packages, installers, zips, and Linux packages." />
-    <SubsetName Include="Bundles" Description="The shared framework bundle installer projects. Produces .exe installers for Windows." />
    <SubsetName Include="Installers" Description="Generates additional installers. This produces the shared frameworks and their installers." />


Suggested change

<SubsetName Include="Installers" Description="Generates additional installers. This produces the shared frameworks and their installers." />

<SubsetName Include="Installers" Description="Generates installers. This produces the deployment tooling installers." />

Will fix - thanks.

dagood · 2020-06-29T14:50:50Z

eng/Subsets.props

  </ItemGroup>

  <ItemGroup Condition="$(_subset.Contains('+installers+'))">
-    <InstallerProjectToBuild Include="$(InstallerProjectRoot)pkg\packaging\installers.proj" BuildInParallel="false" />
-    <InstallerProjectToBuild Include="$(InstallerProjectRoot)pkg\packaging\vs-insertion-packages.proj" BuildInParallel="false" />
+    <InstallerProjectToBuild Include="$(InstallerProjectRoot)**\*.proj" BuildInParallel="false" />


BuildInParallel="false" is a workaround that shouldn't be necessary: dotnet/runtime#494 (comment).

dagood · 2020-06-29T16:08:46Z

eng/liveBuilds.targets

    If this is running and the output RID is not the same as the targeted RID, resolve live assets
    for the targeted RID, if available. This is used to gather asset metadata for the platform
-    manifest. In CI (multi-machine lab) builds, CoreCLR and Libraries artifacts are all downloaded
+    manifest. In CI (multi-machine lab) builds, ClickOnce and other artifacts are all downloaded
    onto the current machine from all platforms for the Installer portion of the build.


Is this actually necessary (and is it performed) for deployment-tools?

dagood · 2020-06-29T16:10:48Z

eng/liveBuilds.targets

-    <Error Condition="!Exists('$(LibrariesSharedFrameworkRefArtifactsPath)')" Text="The 'libs' subset must be built before building this project. Missing artifacts: $(LibrariesSharedFrameworkRefArtifactsPath)" />
-    <Error Condition="'$(IncludeOOBLibraries)' == 'true' and !Exists('$(LibrariesAllRefArtifactsPath)')" Text="The 'libs' subset must be built before building this project. Missing artifacts: $(LibrariesAllRefArtifactsPath)" />
-  </Target>
-
  <!--
    Ensure artifacts exist for the more advanced paths. If the configuration is '*', don't emit
    these errors: it isn't a local dev scenario.
  -->


Orphaned comment

dagood · 2020-06-29T16:12:47Z

src/clickonce/Directory.Build.props

  </PropertyGroup>

  <PropertyGroup>
-    <DisableCrossgen>false</DisableCrossgen>
-    <!-- Disable cross-gen on FreeBSD for now. This can be revisited when we have full support. -->
-    <DisableCrossgen Condition="'$(TargetOS)'=='FreeBSD'">true</DisableCrossgen>
    <OutputVersionBadge>$(AssetOutputPath)sharedfx_$(OutputRid)_$(Configuration)_version_badge.svg</OutputVersionBadge>


Remove this too? Old usage is in pkg/packaging/installers.proj: https://github.com/dotnet/runtime/blob/5f09f33bc547e7c6733ab89e05baf9e860079bba/src/installer/pkg/packaging/installers.proj#L182

Yeah - not needed, will remove.

dagood · 2020-06-29T16:22:55Z

src/clickonce/native/CMakeLists.txt

@@ -11,4 +11,6 @@ if(MSVC)
    add_compile_options(/EHsc)
 endif()

-add_subdirectory(cli)
+set(APP_HOST_LIB_DIR ${DOTNET_PACKS_DIR}/Microsoft.NETCore.App.Host.win-${CLR_CMAKE_HOST_ARCH}/${NET_CORE_PKG_VER}/runtimes/win-${CLR_CMAKE_HOST_ARCH}/native)


This seems fragile... I think ideally you would resolve it via MSBuild (from global install or local--whatever's running) to get the right arch + version + location.

ProcessFrameworkReferences sets up this item with dotnet publish -r win-x64 --self-contained false /bl on a simple console app proj. Might be the best way to go:

AppHost PackageDirectory = C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Host.win-x64\3.1.2 Path = C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Host.win-x64\3.1.2\runtimes\win-x64\native\apphost.exe PathInPackage = runtimes\win-x64\native\apphost.exe RuntimeIdentifier = win-x64

I think it's reasonable to track this as a future improvement and use what you already have to get the repo off the ground.

(On the other hand... I don't actually see how this cmake var is used.)

This will be used with a project that will be added as soon as infra is ready. I will open an issue to improve this.

dagood · 2020-06-29T16:24:12Z

src/clickonce/native/build.proj

-    <Message Text="$(MSBuildProjectDirectory)\build.sh $(BuildArgs)" Importance="High"/>
-    <Exec Command="$(MSBuildProjectDirectory)\build.sh $(BuildArgs)" IgnoreStandardErrorWarningFormat="true"/>
-  </Target>
-
  <Target Name="BuildCoreHostWindows"


Target name inaccurate? (Maybe just make it more generic.)

Thanks - will fix.

Update baseline infra with specifics for deployment-tools repo

151eaa1

NikolaMilosavljevic requested review from MichaelSimons and dagood June 24, 2020 15:20

dagood reviewed Jun 29, 2020

View reviewed changes

Updates for PR comments

fafe21e

dagood approved these changes Jun 29, 2020

View reviewed changes

NikolaMilosavljevic merged commit b4a456a into dotnet:master Jun 29, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update baseline infra with specifics for deployment-tools repo #1

Update baseline infra with specifics for deployment-tools repo #1

NikolaMilosavljevic commented Jun 24, 2020

dagood Jun 29, 2020

NikolaMilosavljevic Jun 29, 2020

dagood Jun 29, 2020

NikolaMilosavljevic Jun 29, 2020

dagood Jun 29, 2020

NikolaMilosavljevic Jun 29, 2020

dagood Jun 29, 2020

dagood Jun 29, 2020

dagood Jun 29, 2020

NikolaMilosavljevic Jun 29, 2020

dagood Jun 29, 2020

NikolaMilosavljevic Jun 29, 2020

dagood Jun 29, 2020

NikolaMilosavljevic Jun 29, 2020

	<SubsetName Include="Installers" Description="Generates additional installers. This produces the shared frameworks and their installers." />
	<SubsetName Include="Installers" Description="Generates installers. This produces the deployment tooling installers." />

Update baseline infra with specifics for deployment-tools repo #1

Update baseline infra with specifics for deployment-tools repo #1

Conversation

NikolaMilosavljevic commented Jun 24, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment