dnup code review

.vsts-dnup-ci.yml

@@ -0,0 +1,130 @@
+# Pipeline: https://dev.azure.com/dnceng/internal/_build?definitionId=
+
+trigger:
+  batch: true
+  branches:
+    include:
+    - dnup
+    - release/dnup
+
+pr:
+  branches:
+    include:
+    - dnup
+    - release/dnup
+
+parameters:
+# When true, runs the pipeline in the same way as the PR pipeline.
+- name: runTestBuild
+  displayName: Run A Test Build
+  type: boolean
+  default: false
+- name: enableArm64Job
+  displayName: Enables the ARM64 job
+  type: boolean
+  default: false
+
+variables:
+- template: /eng/pipelines/templates/variables/sdk-defaults.yml
+# Variables used: DncEngInternalBuildPool
+- template: /eng/common/templates-official/variables/pool-providers.yml
+# Helix testing requires a token when internally run.
+# Variables used: HelixApiAccessToken
+- group: DotNet-HelixApi-Access
+- group: AzureDevOps-Artifact-Feeds-Pats
+# Allows Arcade to run a signed build by disabling post-build signing for release-branch builds or manual builds that are not running tests.
+- ${{ if and(eq(parameters.runTestBuild, false), or(startswith(variables['Build.SourceBranch'], 'refs/heads/release/'), startswith(variables['Build.SourceBranch'], 'refs/heads/internal/release/'), eq(variables['Build.Reason'], 'Manual'))) }}:
+  - name: PostBuildSign
+    value: false
+# Provides TSA variables for automatic bug reporting.
+- ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
+  - group: DotNet-CLI-SDLValidation-Params
+### LOCAL ONLY ###
+- name: _publishArgument
+  value: -publish
+- name: _signArgument
+  value: -sign /p:SignCoreSdk=true
+- name: _officialBuildProperties
+  # The OfficialBuilder property is set to Microsoft for the official build only.
+  # This property is checked in Directory.Build.props and adds the MICROSOFT_ENABLE_TELEMETRY constant.
+  # This constant is used in CompileOptions.cs to set both TelemetryOptOutDefault and TelemetryOptOutDefaultString.
+  value: /p:DotNetPublishUsingPipelines=true /p:OfficialBuilder=Microsoft /p:OfficialBuildId=$(Build.BuildNumber)
+
+resources:
+  repositories:
+  - repository: 1esPipelines
+    type: git
+    name: 1ESPipelineTemplates/1ESPipelineTemplates
+    ref: refs/tags/release
+
+extends:
+  ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
+    template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
+  ${{ else }}:
+    template: v1/1ES.Unofficial.PipelineTemplate.yml@1esPipelines
+  parameters:
+    containers:
+      azureLinux30Amd64:
+        image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-build-amd64
+
+    sdl:
+      sourceAnalysisPool:
+        name: $(DncEngInternalBuildPool)
+        image: 1es-windows-2022
+        os: windows
+      policheck:
+        enabled: true
+      tsa:
+        enabled: true
+      binskim:
+        enabled: true
+      ${{ if or(eq(parameters.runTestBuild, true), eq(variables['Build.Reason'], 'PullRequest')) }}:
+        componentgovernance:
+          # Refdoc: https://docs.opensource.microsoft.com/tools/cg/component-detection/variables/
+          ignoreDirectories: artifacts, .packages
+
+    stages:
+    ############### BUILD STAGE ###############
+      ############### WINDOWS ###############
+      - template: /eng/pipelines/templates/jobs/dnup-tests.yml@self
+        parameters:
+          pool:
+            name: $($(DncEngInternalBuildPool))
+            image: windows.vs2022.amd64
+            os: windows
+            emoji: 🪟
+          helixTargetQueue: windows.amd64.vs2022.pre
+          oneESCompat:
+            templateFolderName: templates-official
+            publishTaskPrefix: 1ES.
+          runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
+          # WORKAROUND: BinSkim requires the folder exist prior to scanning.
+          preSteps:
+          - powershell: New-Item -ItemType Directory -Path $(Build.SourcesDirectory)/artifacts/bin -Force
+            displayName: Create artifacts/bin directory
+          ${{ if and(eq(parameters.runTestBuild, false), ne(variables['Build.Reason'], 'PullRequest')) }}:
+            timeoutInMinutes: 180
+            windowsJobParameterSets:
+            ### OFFICIAL ###
+            - categoryName: Official
+              publishArgument: $(_publishArgument)
+              signArgument: $(_signArgument)
+              officialBuildProperties: $(_officialBuildProperties) /p:BuildWorkloads=true
+              enableDefaultArtifacts: true
+              runTests: false
+              publishRetryConfig: true
+              variables:
+                _SignType: real
+
+    ############### PACKAGE STAGE ###############
+    - ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
+      - stage: publish
+        displayName: Publish
+        dependsOn: []
+        jobs:
+        - template: /eng/pipelines/templates/jobs/dnup-library-package.yml@self
+          parameters:
+            pool:
+              name: $(DncEngInternalBuildPool)
+              image: 1es-windows-2022
+              os: windows

.vsts-dnup-pr.yml

@@ -0,0 +1,72 @@
+# Pipeline: https://dev.azure.com/dnceng-public/public/_build?definitionId=323
+
+trigger: none
+
+pr:
+  branches:
+    include:
+    - dnup
+  paths:
+    include:
+    - src/Installer/dnup/
+    - test/dnup.Tests/
+    - global.json
+    - .vsts-dnup-tests.yml
+
+parameters:
+- name: enableArm64Job
+  displayName: Enables the ARM64 job
+  type: boolean
+  default: true
+
+variables:
+- template: /eng/pipelines/templates/variables/sdk-defaults.yml
+  # Variables used: DncEngPublicBuildPool
+- template: /eng/common/templates/variables/pool-providers.yml
+
+stages:
+- stage: dnup
+  displayName: 🏰 dnup tests
+  jobs:
+  ############### WINDOWS ###############
+  - template: /eng/pipelines/templates/jobs/dnup-tests.yml@self
+    parameters:
+      pool:
+        name: $(DncEngPublicBuildPool)
+        demands: ImageOverride -equals windows.vs2022.amd64.open
+        os: windows
+        emoji: 🪟
+      helixTargetQueue: windows.amd64.vs2022.pre.open
+
+  ############### LINUX ###############
+  - template: /eng/pipelines/templates/jobs/dnup-tests.yml@self
+    parameters:
+      pool:
+        name: $(DncEngPublicBuildPool)
+        demands: ImageOverride -equals build.ubuntu.2204.amd64.open
+        os: linux
+        emoji: 🐧
+      helixTargetQueue: ubuntu.2204.amd64.open
+
+  ############### MACOS ###############
+  - template: /eng/pipelines/templates/jobs/dnup-tests.yml@self
+    parameters:
+      pool:
+        name: Azure Pipelines
+        vmImage: macOS-latest
+        os: macOS
+        emoji: 🍎
+      helixTargetQueue: osx.15.amd64.open
+
+  ### ARM64 ###
+  - ${{ if eq(parameters.enableArm64Job, true) }}:
+    - template: /eng/pipelines/templates/jobs/dnup-tests.yml@self
+      parameters:
+        pool:
+          name: Azure Pipelines
+          vmImage: macOS-latest
+          os: macOS
+          emoji: 💪
+        helixTargetQueue: osx.13.arm64.open
+
+

Directory.Packages.props

@@ -114,6 +114,7 @@
     <PackageVersion Include="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreDotNetHostResolverPackageVersion)" />
     <PackageVersion Include="runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreDotNetHostResolverPackageVersion)" />
     <PackageVersion Include="StyleCop.Analyzers" Version="$(StyleCopAnalyzersPackageVersion)" />
+    <PackageVersion Include="Spectre.Console" Version="0.48.0" />
     <PackageVersion Include="System.CodeDom" Version="$(SystemCodeDomPackageVersion)" />
     <PackageVersion Include="System.CommandLine" Version="$(SystemCommandLineVersion)" />
     <PackageVersion Include="System.CommandLine.NamingConventionBinder" Version="$(SystemCommandLineNamingConventionBinderVersion)" />

dnup.slnf

@@ -0,0 +1,11 @@
+{
+  "solution": {
+    "path": "sdk.slnx",
+    "projects": [
+      "src\\Installer\\dnup\\dnup.csproj",
+      "src\\Installer\\Microsoft.Dotnet.Installation\\Microsoft.Dotnet.Installation.csproj",
+      "test\\dnup.Tests\\dnup.Tests.csproj",
+      "src\\Resolvers\\Microsoft.DotNet.NativeWrapper\\Microsoft.DotNet.NativeWrapper.csproj
+    ]
+  }
+}

eng/pipelines/templates/jobs/dnup-tests.yml

@@ -0,0 +1,88 @@
+parameters:
+  ### GENERAL ###
+  variables: {}
+  dependsOn: ''
+  helixTargetQueue: ''
+  oneESCompat:
+    templateFolderName: templates
+    publishTaskPrefix: ''
+  container: ''
+  helixTargetContainer: ''
+  categoryName: dnup
+  runTests: true
+  publishRetryConfig: false
+  publishXunitResults: false
+  enableSbom: true
+  timeoutInMinutes: 150
+
+jobs:
+- template: /eng/common/${{ parameters.oneESCompat.templateFolderName }}/job/job.yml
+  parameters:
+    displayName: '${{ parameters.pool.emoji }} dnup tests: ${{ parameters.pool.os }} (${{ parameters.helixTargetQueue }})'
+    pool: ${{ parameters.pool }}
+    container: ${{ parameters.container }}
+    strategy: ${{ parameters.strategy }}
+    helixRepo: dotnet/sdk
+    timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
+    enableMicrobuild: true
+    enablePublishBuildAssets: true
+    enableTelemetry: true
+    enablePublishUsingPipelines: true
+    enableSbom: ${{ parameters.enableSbom }}
+    variables:
+    - ${{ insert }}: ${{ parameters.variables }}
+    dependsOn: ${{ parameters.dependsOn }}
+    preSteps: ${{ parameters.preSteps }}
+    templateContext:
+      sdl:
+        binskim:
+          analyzeTargetGlob: +:f|eng\**\*.props;+:f|artifacts\bin\**\*.dll;+:f|artifacts\bin\**\*.exe;-:f|artifacts\bin\**\msdia140.dll;-:f|artifacts\bin\**\pgort140.dll;-:f|artifacts\bin\*Tests\**;-:f|**\Microsoft.NET.Runtime.Emscripten**\tools\**;-:f|**\CodeCoverage\**;-:f|artifacts\bin\**\capstone.dll;
+
+    steps:
+    - ${{ if eq(parameters.pool.os, 'windows') }}:
+      - powershell: |
+          & .\restore.cmd
+        displayName: 🍱 Bootstrap toolset (Windows)
+      - powershell: |
+          & .\.dotnet\dotnet restore test\dnup.Tests\dnup.Tests.csproj
+        displayName: ♻️ Restore dnup tests (Windows)
+      - powershell: |
+          & .\.dotnet\dotnet build test\dnup.Tests\dnup.Tests.csproj -c Release --no-restore
+        displayName: 💻 Build Windows
+      - powershell: |
+          New-Item -Path "$(Build.SourcesDirectory)/artifacts/dnupTestResults" -ItemType Directory -Force
+        displayName: 📁 Create test results directory (Windows)
+      - powershell: |
+          & .\.dotnet\dotnet test test\dnup.Tests\dnup.Tests.csproj -c Release --no-build --logger "trx;LogFileName=dnup-tests.trx" --results-directory $(Build.SourcesDirectory)/artifacts/dnupTestResults
+        displayName: 🔍 Test Windows
+    - ${{ if ne(parameters.pool.os, 'windows') }}:
+      - script: |
+          ./restore.sh
+        displayName: 🍱 Bootstrap toolset (Unix)
+      - script: |
+          ./.dotnet/dotnet restore test/dnup.Tests/dnup.Tests.csproj
+        displayName: ♻️ Restore dnup tests (Unix)
+      - script: |
+          ./.dotnet/dotnet build test/dnup.Tests/dnup.Tests.csproj -c Release --no-restore
+        displayName: 🐧 Build (Unix)
+      - script: |
+          mkdir -p "$(Build.SourcesDirectory)/artifacts/dnupTestResults"
+        displayName: 📁 Create test results directory (Unix)
+      - script: |
+          ./.dotnet/dotnet test test/dnup.Tests/dnup.Tests.csproj -c Release --no-build --logger "trx;LogFileName=dnup-tests.trx" --results-directory $(Build.SourcesDirectory)/artifacts/dnupTestResults
+        displayName: 🔎 Test (Unix)
+    - task: PublishTestResults@2
+      displayName: 🚀 Publish test results
+      condition: always()
+      inputs:
+        testResultsFormat: VSTest
+        testResultsFiles: '**/dnup-tests.trx'
+        searchFolder: $(Build.SourcesDirectory)/artifacts/dnupTestResults
+        testRunTitle: 'dnup ${{ parameters.pool.os }}'
+    - task: PublishBuildArtifacts@1
+      displayName: ⬇️ Publish test artifacts
+      condition: always()
+      inputs:
+        PathtoPublish: $(Build.SourcesDirectory)/artifacts/dnupTestResults
+        ArtifactName: dnupTestResults_${{ parameters.pool.os }}
+        publishLocation: Container

sdk.slnx

@@ -3,7 +3,6 @@
     <File Path="eng/dogfood.cmd" />
     <File Path="eng/dogfood.sh" />
     <File Path="eng/Versions.props" />
-    <File Path="eng/Version.Details.props" />
   </Folder>
   <Folder Name="/Solution Items/">
     <File Path=".editorconfig" />
@@ -88,6 +87,10 @@
     <Project Path="src/Containers/Microsoft.NET.Build.Containers/Microsoft.NET.Build.Containers.csproj" />
     <Project Path="src/Containers/packaging/package.csproj" />
   </Folder>
+  <Folder Name="/src/Installer/">
+    <Project Path="src/Installer/dnup/dnup.csproj" />
+    <Project Path="src/Installer/Microsoft.Dotnet.Installation/Microsoft.Dotnet.Installation.csproj" />
+  </Folder>
   <Folder Name="/src/Layout/">
     <Project Path="src/Layout/finalizer/finalizer.csproj" />
     <Project Path="src/Layout/pkg/dotnet-sdk.proj" Type="C#" />
@@ -309,6 +312,7 @@
     <Project Path="test/ArgumentForwarding.Tests/ArgumentForwarding.Tests.csproj" />
     <Project Path="test/ArgumentsReflector/ArgumentsReflector.csproj" />
     <Project Path="test/containerize.UnitTests/containerize.UnitTests.csproj" />
+    <Project Path="test/dnup.Tests/dnup.Tests.csproj" />
     <Project Path="test/dotnet-format.UnitTests/dotnet-format.UnitTests.csproj" />
     <Project Path="test/dotnet-MsiInstallation.Tests/dotnet-MsiInstallation.Tests.csproj" />
     <Project Path="test/dotnet-new.IntegrationTests/dotnet-new.IntegrationTests.csproj" />

src/Cli/dotnet/Telemetry/EnvironmentDetectionRule.cs

@@ -33,7 +33,7 @@ public BooleanEnvironmentRule(params string[] variables)
 
     public override bool IsMatch()
     {
-        return _variables.Any(variable => 
+        return _variables.Any(variable =>
             bool.TryParse(Environment.GetEnvironmentVariable(variable), out bool value) && value);
     }
 }
@@ -96,8 +96,8 @@ public EnvironmentDetectionRuleWithResult(T result, params string[] variables)
     /// <returns>The result value if the rule matches; otherwise, null.</returns>
     public T? GetResult()
     {
-        return _variables.Any(variable => !string.IsNullOrEmpty(Environment.GetEnvironmentVariable(variable))) 
-            ? _result 
+        return _variables.Any(variable => !string.IsNullOrEmpty(Environment.GetEnvironmentVariable(variable)))
+            ? _result
             : null;
     }
-}
+}

src/Installer/.github/copilot-instructions.md

@@ -0,0 +1,8 @@
+
+---
+applyTo: "**"
+---
+- Environment: Windows 11 using PowerShell 7
+- Never use `&&` to chain commands; use semicolon (`;`) for PowerShell command chaining
+- Prefer PowerShell cmdlets over external utilities when available
+- Use PowerShell-style parameter syntax (-Parameter) rather than Unix-style flags

src/Installer/Microsoft.Dotnet.Installation/AssemblyInfo.cs

@@ -0,0 +1,10 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using System.Text;
+
+[assembly: InternalsVisibleTo("dnup, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
+[assembly: InternalsVisibleTo("dnup.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]

src/Installer/Microsoft.Dotnet.Installation/DotnetInstallRoot.cs

@@ -0,0 +1,11 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Microsoft.Dotnet.Installation;
+public record DotnetInstallRoot(
+    string Path,
+    InstallArchitecture Architecture);