Onboard to Arcade (#1868)

Author: lbussell

.editorconfig

@@ -159,6 +159,7 @@ dotnet_code_quality.ca2208.api_surface = public
 
 # License header
 file_header_template = Licensed to the .NET Foundation under one or more agreements.\nThe .NET Foundation licenses this file to you under the MIT license.
+dotnet_diagnostic.IDE0073.severity = warning # IDE0073: The file header is missing or not located at the top of the file
 
 # Xml project files
 [*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,nativeproj,locproj,slnx}]

.gitignore

@@ -2,6 +2,16 @@
 [Bb]in/
 [Oo]bj/
 [Oo]ut/
+[Dd]ebug/
+[Rr]elease/
+artifacts/
+artifacts_stage_1/
+x64/ !eng/common/cross/x64/
+x86/ !eng/common/cross/x86/
+msbuild.log
+msbuild.err
+msbuild.wrn
+*.binlog
 
 # Visual Studio Code cache/options directory
 .vscode/
@@ -14,8 +24,10 @@
 # ImageBuilder directory
 .Microsoft.DotNet.ImageBuilder
 
-# dotnet install directory
+# .NET and tools directories
 .dotnet/
+.packages/
+.tools/
 
 # Test files
 *.trx

Directory.Build.props

@@ -0,0 +1,19 @@
+<Project>
+
+  <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
+
+  <PropertyGroup Label="Build Settings">
+    <LangVersion>latest</LangVersion>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+
+  <PropertyGroup Label="Packaging Settings">
+    <Copyright>$(CopyrightNetFoundation)</Copyright>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageProjectUrl>https://github.com/dotnet/docker-tools</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/dotnet/docker-tools</RepositoryUrl>
+    <DebugType>embedded</DebugType>
+    <DebugSymbols>true</DebugSymbols>
+  </PropertyGroup>
+
+</Project>

Directory.Build.targets

@@ -0,0 +1,9 @@
+<Project>
+
+  <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
+
+  <PropertyGroup>
+    <RestoreEnablePackagePruning>true</RestoreEnablePackagePruning>
+  </PropertyGroup>
+
+</Project>

LICENSE

@@ -1,7 +1,9 @@
-MIT License
+The MIT License (MIT)
 
 Copyright (c) 2017 .NET Foundation
 
+All rights reserved.
+
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights

Microsoft.DotNet.DockerTools.slnx

@@ -7,5 +7,6 @@
   <Project Path="eng/src/file-pusher/file-pusher.csproj" />
   <Project Path="eng/src/yaml-updater/yaml-updater.csproj" />
   <Project Path="src/ImageBuilder/Microsoft.DotNet.ImageBuilder.csproj" />
+  <Project Path="src/ImageBuilder.Models/Microsoft.DotNet.ImageBuilder.Models.csproj" />
   <Project Path="src/ImageBuilder.Tests/Microsoft.DotNet.ImageBuilder.Tests.csproj" />
 </Solution>

NuGet.config

@@ -2,7 +2,11 @@
 <configuration>
   <packageSources>
     <clear />
-    <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
     <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
+    <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
+    <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
+    <add key="dotnet-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
+    <add key="dotnet-9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
+    <add key="dotnet-10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json" />
   </packageSources>
 </configuration>

README.md

@@ -2,22 +2,13 @@
 
 This is a repo to house some common tools for use in the various .NET Docker repos.
 
-## Image Builder
+## Tools
 
-A tool used to build and publish Docker images.
+- [ImageBuilder](./src/README.md) is a tool used to build and publish Docker images.
 
-The Image Builder tool can be acquired via a Docker image available at [mcr.microsoft.com/dotnet-buildtools/image-builder](https://mcr.microsoft.com/v2/dotnet-buildtools/image-builder/tags/list) or built from source via the instructions in its [readme](./src/README.md).
+## Building locally
 
-The Image Builder tool relies on metadata which defines various information needed to build and tag Docker images.  The metadata is stored in a manifest.json file ([sample](https://github.com/dotnet/dotnet-docker/blob/main/manifest.json)).  The metadata schema is defined in [source](./src/ImageBuilder/Models/Manifest/Manifest.cs).
+To build, test, and pack all projects in the repo, run one of the following scripts:
 
-The full list of supported commands can be seen by running the tool.
-
-```console
-docker run --rm -v /var/run/docker.sock:/var/run/docker.sock mcr.microsoft.com/dotnet-buildtools/image-builder --help
-```
-
-The list of supported options for each command can be seen by specifying the `--help` option:
-
-```console
-docker run --rm -v /var/run/docker.sock:/var/run/docker.sock mcr.microsoft.com/dotnet-buildtools/image-builder build --help
-```
+- **Windows**: `build.cmd`
+- **Linux/Mac**: `./build.sh`

build.cmd

@@ -0,0 +1,3 @@
+@echo off
+powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\common\Build.ps1""" -build -restore -test -pack %*"
+exit /b %ErrorLevel%

build.sh

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+source="${BASH_SOURCE[0]}"
+
+# resolve $SOURCE until the file is no longer a symlink
+while [[ -h $source ]]; do
+  scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
+  source="$(readlink "$source")"
+
+  # if $source was a relative symlink, we need to resolve it relative to the path where the
+  # symlink file was located
+  [[ $source != /* ]] && source="$scriptroot/$source"
+done
+
+scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
+"$scriptroot/eng/common/build.sh" --restore --build --test --pack $@