Rename dnup to dotnetup

.vsts-dnup-ci.yml

@@ -6,12 +6,14 @@ trigger:
     include:
     - dnup
     - release/dnup
+    - release/dotnetup
 
 pr:
   branches:
     include:
     - dnup
     - release/dnup
+    - release/dotnetup
 
 parameters:
 # When true, runs the pipeline in the same way as the PR pipeline.
@@ -91,10 +93,10 @@ extends:
 
     stages:
       - stage: tests
-        displayName: 🧪 dnup tests
+        displayName: 🧪 dotnetup tests
         jobs:
         ### Windows ###
-        - template: /eng/pipelines/templates/jobs/dnup/dnup-tests.yml@self
+        - template: /eng/pipelines/templates/jobs/dotnetup/dotnetup-tests.yml@self
           parameters:
             pool:
               name: $(DncEngInternalBuildPool)
@@ -125,10 +127,10 @@ extends:
                   _SignType: real
       ### Packaging ###
       - stage: package
-        displayName: 📦 Package dnup
+        displayName: 📦 Package dotnetup
         dependsOn: []
         jobs:
-        - template: /eng/pipelines/templates/jobs/dnup/dnup-library-package.yml@self
+        - template: /eng/pipelines/templates/jobs/dotnetup/dotnetup-library-package.yml@self
           parameters:
             pool:
               name: $(DncEngInternalBuildPool)

.vsts-dnup-pr.yml

@@ -7,6 +7,7 @@ pr:
     include:
     - dnup
     - release/dnup
+    - release/dotnetup
 
 parameters:
 - name: enableArm64Job
@@ -20,11 +21,11 @@ variables:
 - template: /eng/common/templates/variables/pool-providers.yml
 
 stages:
-- stage: dnup
-  displayName: 🏰 dnup tests
+- stage: dotnetup
+  displayName: 🏰 dotnetup tests
   jobs:
   ############### WINDOWS ###############
-  - template: /eng/pipelines/templates/jobs/dnup/dnup-tests.yml@self
+  - template: /eng/pipelines/templates/jobs/dotnetup/dotnetup-tests.yml@self
     parameters:
       pool:
         name: $(DncEngPublicBuildPool)
@@ -34,7 +35,7 @@ stages:
       helixTargetQueue: windows.amd64.vs2022.pre.open
 
   ############### LINUX ###############
-  - template: /eng/pipelines/templates/jobs/dnup/dnup-tests.yml@self
+  - template: /eng/pipelines/templates/jobs/dotnetup/dotnetup-tests.yml@self
     parameters:
       pool:
         name: $(DncEngPublicBuildPool)
@@ -44,7 +45,7 @@ stages:
       helixTargetQueue: ubuntu.2204.amd64.open
 
   ############### MACOS ###############
-  - template: /eng/pipelines/templates/jobs/dnup/dnup-tests.yml@self
+  - template: /eng/pipelines/templates/jobs/dotnetup/dotnetup-tests.yml@self
     parameters:
       pool:
         name: Azure Pipelines
@@ -55,7 +56,7 @@ stages:
 
   ### ARM64 ###
   - ${{ if eq(parameters.enableArm64Job, true) }}:
-    - template: /eng/pipelines/templates/jobs/dnup/dnup-tests.yml@self
+    - template: /eng/pipelines/templates/jobs/dotnetup/dotnetup-tests.yml@self
       parameters:
         pool:
           name: Azure Pipelines

.vsts-pr.yml

@@ -15,9 +15,9 @@ pr:
     - CODEOWNERS
     - .vsts-dnup-ci.yml
     - .vsts-dnup-pr.yml
-    - /eng/pipelines/templates/jobs/dnup/*
+    - /eng/pipelines/templates/jobs/dotnetup/*
     - src/Installer/*
-    - test/dnup.Tests/*
+    - test/dotnetup.Tests/*
 
 parameters:
 - name: enableArm64Job

dnup.slnf → dotnetup.slnf

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

eng/pipelines/templates/jobs/dnup/dnup-library-package.yml → eng/pipelines/templates/jobs/dotnetup/dotnetup-library-package.yml

@@ -8,7 +8,7 @@ parameters:
     publishTaskPrefix: ''
   container: ''
   helixTargetContainer: ''
-  categoryName: dnup
+  categoryName: dotnetup
   runTests: true
   publishRetryConfig: false
   publishXunitResults: false
@@ -18,7 +18,7 @@ parameters:
 jobs:
 - template: /eng/common/${{ parameters.oneESCompat.templateFolderName }}/job/job.yml
   parameters:
-    displayName: '${{ parameters.pool.emoji }} dnup package: ${{ parameters.pool.os }} (${{ parameters.helixTargetQueue }})'
+    displayName: '${{ parameters.pool.emoji }} dotnetup package: ${{ parameters.pool.os }} (${{ parameters.helixTargetQueue }})'
     pool: ${{ parameters.pool }}
     container: ${{ parameters.container }}
     strategy: ${{ parameters.strategy }}
@@ -41,31 +41,31 @@ jobs:
           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;
       outputs:
       - output: pipelineArtifact
-        displayName: '🌐 Publish dnup library packages'
+        displayName: '🌐 Publish dotnetup library packages'
         condition: always()
         targetPath: '$(Build.SourcesDirectory)/artifacts/packages/Release/NonShipping/'
-        artifactName: 'dnup-library-packages'
+        artifactName: 'dotnetup-library-packages'
         publishLocation: Container
       - output: pipelineArtifact
-        displayName: '📊 Publish dnup library build binlogs'
+        displayName: '📊 Publish dotnetup library build binlogs'
         condition: always()
         targetPath: '$(Build.SourcesDirectory)/artifacts/binlogs/'
-        artifactName: 'dnup-library-binlogs'
+        artifactName: 'dotnetup-library-binlogs'
         publishLocation: Container
     steps:
     - ${{ if eq(parameters.pool.os, 'windows') }}:
       - powershell: |
           & .\restore.cmd $(_officialBuildProperties)
         displayName: 🍱 Bootstrap toolset (Windows)
       - powershell: |
-          & .\.dotnet\dotnet build test\dnup.Tests\dnup.Tests.csproj -c Release -bl:$(Build.SourcesDirectory)/artifacts/binlogs/dnup-library-build.binlog $(_officialBuildProperties)
+          & .\.dotnet\dotnet build test\dotnetup.Tests\dotnetup.Tests.csproj -c Release -bl:$(Build.SourcesDirectory)/artifacts/binlogs/dotnetup-library-build.binlog $(_officialBuildProperties)
         displayName: 💻 Build Windows
       - powershell: |
-          & .\.dotnet\dotnet pack .\src\Installer\Microsoft.Dotnet.Installation\Microsoft.Dotnet.Installation.csproj -bl:$(Build.SourcesDirectory)/artifacts/binlogs/dnup-library-package.binlog $(_officialBuildProperties)
-        displayName: 📦 Package dnup library
+          & .\.dotnet\dotnet pack .\src\Installer\Microsoft.Dotnet.Installation\Microsoft.Dotnet.Installation.csproj -bl:$(Build.SourcesDirectory)/artifacts/binlogs/dotnetup-library-package.binlog $(_officialBuildProperties)
+        displayName: 📦 Package dotnetup library
       - powershell: |
-          & .\.dotnet\dotnet build .\src\Installer\Installer.sign.proj /t:Sign -bl:$(Build.SourcesDirectory)/artifacts/binlogs/dnup-library-sign.binlog $(_officialBuildProperties)
-        displayName: 🖋️ Sign dnup library packages with arcade signtool
+          & .\.dotnet\dotnet build .\src\Installer\Installer.sign.proj /t:Sign -bl:$(Build.SourcesDirectory)/artifacts/binlogs/dotnetup-library-sign.binlog $(_officialBuildProperties)
+        displayName: 🖋️ Sign dotnetup library packages with arcade signtool
       - task: 1ES.PublishNuget@1
         displayName: 🟣 Publish packages to AzDO
         inputs:

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

@@ -8,7 +8,7 @@ parameters:
     publishTaskPrefix: ''
   container: ''
   helixTargetContainer: ''
-  categoryName: dnup
+  categoryName: dotnetup
   runTests: true
   publishRetryConfig: false
   publishXunitResults: false
@@ -18,7 +18,7 @@ parameters:
 jobs:
 - template: /eng/common/${{ parameters.oneESCompat.templateFolderName }}/job/job.yml
   parameters:
-    displayName: '${{ parameters.pool.emoji }} dnup tests: ${{ parameters.pool.os }} (${{ parameters.helixTargetQueue }})'
+    displayName: '${{ parameters.pool.emoji }} dotnetup tests: ${{ parameters.pool.os }} (${{ parameters.helixTargetQueue }})'
     pool: ${{ parameters.pool }}
     container: ${{ parameters.container }}
     strategy: ${{ parameters.strategy }}
@@ -41,8 +41,8 @@ jobs:
       - output: pipelineArtifact
         displayName: '🌐 Publish Test Artifacts'
         condition: always()
-        targetPath: '$(Build.SourcesDirectory)/artifacts/dnupTestResults'
-        artifactName: 'dnupTestResults_${{ parameters.pool.os }}'
+        targetPath: '$(Build.SourcesDirectory)/artifacts/dotnetupTestResults'
+        artifactName: 'dotnetupTestResults_${{ parameters.pool.os }}'
         publishLocation: Container
 
     steps:
@@ -51,38 +51,38 @@ jobs:
           & .\restore.cmd
         displayName: 🍱 Bootstrap toolset (Windows)
       - powershell: |
-          & .\.dotnet\dotnet restore test\dnup.Tests\dnup.Tests.csproj
-        displayName: ♻️ Restore dnup tests (Windows)
+          & .\.dotnet\dotnet restore test\dotnetup.Tests\dotnetup.Tests.csproj
+        displayName: ♻️ Restore dotnetup tests (Windows)
       - powershell: |
-          & .\.dotnet\dotnet build test\dnup.Tests\dnup.Tests.csproj -c Release --no-restore
+          & .\.dotnet\dotnet build test\dotnetup.Tests\dotnetup.Tests.csproj -c Release --no-restore
         displayName: 💻 Build Windows
       - powershell: |
-          New-Item -Path "$(Build.SourcesDirectory)/artifacts/dnupTestResults" -ItemType Directory -Force
+          New-Item -Path "$(Build.SourcesDirectory)/artifacts/dotnetupTestResults" -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
+          & .\.dotnet\dotnet test test\dotnetup.Tests\dotnetup.Tests.csproj -c Release --no-build --logger "trx;LogFileName=dotnetup-tests.trx" --results-directory $(Build.SourcesDirectory)/artifacts/dotnetupTestResults
         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)
+          ./.dotnet/dotnet restore test/dotnetup.Tests/dotnetup.Tests.csproj
+        displayName: ♻️ Restore dotnetup tests (Unix)
       - script: |
-          ./.dotnet/dotnet build test/dnup.Tests/dnup.Tests.csproj -c Release --no-restore
+          ./.dotnet/dotnet build test/dotnetup.Tests/dotnetup.Tests.csproj -c Release --no-restore
         displayName: 🐧 Build (Unix)
       - script: |
-          mkdir -p "$(Build.SourcesDirectory)/artifacts/dnupTestResults"
+          mkdir -p "$(Build.SourcesDirectory)/artifacts/dotnetupTestResults"
         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
+          ./.dotnet/dotnet test test/dotnetup.Tests/dotnetup.Tests.csproj -c Release --no-build --logger "trx;LogFileName=dotnetup-tests.trx" --results-directory $(Build.SourcesDirectory)/artifacts/dotnetupTestResults
         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 }}'
+        testResultsFiles: '**/dotnetup-tests.trx'
+        searchFolder: $(Build.SourcesDirectory)/artifacts/dotnetupTestResults
+        testRunTitle: 'dotnetup ${{ parameters.pool.os }}'

sdk.slnx

@@ -88,7 +88,7 @@
     <Project Path="src/Containers/packaging/package.csproj" />
   </Folder>
   <Folder Name="/src/Installer/">
-    <Project Path="src/Installer/dnup/dnup.csproj" />
+    <Project Path="src/Installer/dotnetup/dotnetup.csproj" />
     <Project Path="src/Installer/Microsoft.Dotnet.Installation/Microsoft.Dotnet.Installation.csproj" />
   </Folder>
   <Folder Name="/src/Layout/">
@@ -312,12 +312,12 @@
     <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" />
     <Project Path="test/dotnet-watch.Tests/dotnet-watch.Tests.csproj" />
     <Project Path="test/dotnet.Tests/dotnet.Tests.csproj" />
+    <Project Path="test/dotnetup.Tests/dotnetup.Tests.csproj" />
     <Project Path="test/EndToEnd.Tests/EndToEnd.Tests.csproj" />
     <Project Path="test/HelixTasks/HelixTasks.csproj" />
     <Project Path="test/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests.csproj" />

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

@@ -6,5 +6,5 @@
 using System.Runtime.CompilerServices;
 using System.Text;
 
-[assembly: InternalsVisibleTo("dnup, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
-[assembly: InternalsVisibleTo("dnup.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
+[assembly: InternalsVisibleTo("dotnetup, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
+[assembly: InternalsVisibleTo("dotnetup.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]

src/Installer/Microsoft.Dotnet.Installation/Internal/DotnetArchiveDownloader.cs

@@ -68,10 +68,10 @@ private static HttpClient CreateDefaultHttpClient()
             Timeout = TimeSpan.FromMinutes(10)
         };
 
-        // Set user-agent to identify dnup in telemetry, including version
+        // Set user-agent to identify dotnetup in telemetry, including version
         var informationalVersion = typeof(DotnetArchiveDownloader).Assembly
             .GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion;
-        string userAgent = informationalVersion == null ? "dotnetup-dotnet-installer" : $"dnup-dotnet-installer/{informationalVersion}";
+        string userAgent = informationalVersion == null ? "dotnetup-dotnet-installer" : $"dotnetup-dotnet-installer/{informationalVersion}";
 
         client.DefaultRequestHeaders.UserAgent.ParseAdd(userAgent);
 

src/Installer/Microsoft.Dotnet.Installation/Internal/DotnetArchiveExtractor.cs

@@ -36,7 +36,7 @@ public void Prepare()
 
         using var archiveDownloader = new DotnetArchiveDownloader();
         var archiveName = $"dotnet-{Guid.NewGuid()}";
-        _archivePath = Path.Combine(scratchDownloadDirectory, archiveName + DnupUtilities.GetArchiveFileExtensionForPlatform());
+        _archivePath = Path.Combine(scratchDownloadDirectory, archiveName + DotnetupUtilities.GetArchiveFileExtensionForPlatform());
 
         using (var progressReporter = _progressTarget.CreateProgressReporter())
         {
@@ -105,7 +105,7 @@ private MuxerHandlingConfig ConfigureMuxerHandling(IEnumerable<ReleaseVersion> e
         ReleaseVersion newRuntimeVersion = _resolvedVersion;
         bool shouldUpdateMuxer = existingMuxerVersion is null || newRuntimeVersion.CompareTo(existingMuxerVersion) > 0;
 
-        string muxerName = DnupUtilities.GetDotnetExeName();
+        string muxerName = DotnetupUtilities.GetDotnetExeName();
         string muxerTargetPath = Path.Combine(_request.InstallRoot.Path!, muxerName);
 
         return new MuxerHandlingConfig(
@@ -253,7 +253,7 @@ private void HandleMuxerUpdateFromTar(TarEntry entry, string muxerTargetPath)
         try
         {
             // Replace the muxer using the utility that handles locking
-            DnupUtilities.ForceReplaceFile(tempMuxerPath, muxerTargetPath);
+            DotnetupUtilities.ForceReplaceFile(tempMuxerPath, muxerTargetPath);
         }
         finally
         {
@@ -335,7 +335,7 @@ private void HandleMuxerUpdateFromZip(ZipArchiveEntry entry, string muxerTargetP
         try
         {
             // Replace the muxer using the utility that handles locking
-            DnupUtilities.ForceReplaceFile(tempMuxerPath, muxerTargetPath);
+            DotnetupUtilities.ForceReplaceFile(tempMuxerPath, muxerTargetPath);
         }
         finally
         {

src/Installer/Microsoft.Dotnet.Installation/Internal/DnupUtilities.cs → src/Installer/Microsoft.Dotnet.Installation/Internal/DotnetupUtilities.cs

@@ -9,7 +9,7 @@
 
 namespace Microsoft.Dotnet.Installation.Internal;
 
-internal static class DnupUtilities
+internal static class DotnetupUtilities
 {
     public static string ExeSuffix = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? ".exe" : "";
 

src/Installer/Microsoft.Dotnet.Installation/Internal/ReleaseManifest.cs

@@ -112,8 +112,8 @@ public ProductCollection GetReleasesIndex()
     /// </summary>
     private static ReleaseFile? FindMatchingFile(ReleaseComponent release, DotnetInstallRequest installRequest, ReleaseVersion resolvedVersion)
     {
-        var rid = DnupUtilities.GetRuntimeIdentifier(installRequest.InstallRoot.Architecture);
-        var fileExtension = DnupUtilities.GetArchiveFileExtensionForPlatform();
+        var rid = DotnetupUtilities.GetRuntimeIdentifier(installRequest.InstallRoot.Architecture);
+        var fileExtension = DotnetupUtilities.GetArchiveFileExtensionForPlatform();
 
         var matchingFiles = release.Files
              .Where(f => f.Rid == rid) // TODO: Do we support musl here?

src/Installer/dnup/.vscode/launch.json → src/Installer/dotnetup/.vscode/launch.json

@@ -2,11 +2,11 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "Launch dnup",
+            "name": "Launch dotnetup",
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build",
-            "program": "${workspaceFolder}/../../../artifacts/bin/dnup/Debug/net10.0/dnup.dll",
+            "program": "${workspaceFolder}/../../../artifacts/bin/dotnetup/Debug/net10.0/dotnetup.dll",
             "args": "${input:commandLineArgs}",
             "cwd": "${workspaceFolder}",
             "console": "integratedTerminal",

src/Installer/dnup/.vscode/settings.json → src/Installer/dotnetup/.vscode/settings.json

@@ -1,5 +1,5 @@
 {
-  "dotnet.defaultSolution": "dnup.csproj",
+  "dotnet.defaultSolution": "dotnetup.csproj",
   "csharp.debug.console": "externalTerminal",
   "editor.formatOnSave": true,
   "omnisharp.enableRoslynAnalyzers": true,
@@ -14,5 +14,5 @@
     "configurations": [],
     "compounds": []
   },
-  "omnisharp.defaultLaunchSolution": "dnup.csproj"
+  "omnisharp.defaultLaunchSolution": "dotnetup.csproj"
 }