diff --git a/.vsts-dnup-ci.yml b/.vsts-dnup-ci.yml index e3c570bf7e2f..e8efbb710d6b 100644 --- a/.vsts-dnup-ci.yml +++ b/.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) diff --git a/.vsts-dnup-pr.yml b/.vsts-dnup-pr.yml index 2cd23a4ca40f..dc0a73026a5b 100644 --- a/.vsts-dnup-pr.yml +++ b/.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 diff --git a/.vsts-pr.yml b/.vsts-pr.yml index a5e6726eab24..2c96873b7ab8 100644 --- a/.vsts-pr.yml +++ b/.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 diff --git a/dnup.slnf b/dotnetup.slnf similarity index 71% rename from dnup.slnf rename to dotnetup.slnf index ba550e59653e..82de61375feb 100644 --- a/dnup.slnf +++ b/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" ] } diff --git a/eng/pipelines/templates/jobs/dnup/dnup-library-package.yml b/eng/pipelines/templates/jobs/dotnetup/dotnetup-library-package.yml similarity index 76% rename from eng/pipelines/templates/jobs/dnup/dnup-library-package.yml rename to eng/pipelines/templates/jobs/dotnetup/dotnetup-library-package.yml index 4645d5f0f935..4b2fb37707b3 100644 --- a/eng/pipelines/templates/jobs/dnup/dnup-library-package.yml +++ b/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,16 +41,16 @@ 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') }}: @@ -58,14 +58,14 @@ jobs: & .\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: diff --git a/eng/pipelines/templates/jobs/dnup/dnup-tests.yml b/eng/pipelines/templates/jobs/dotnetup/dotnetup-tests.yml similarity index 59% rename from eng/pipelines/templates/jobs/dnup/dnup-tests.yml rename to eng/pipelines/templates/jobs/dotnetup/dotnetup-tests.yml index 4b670eac75cb..81b52d6fd137 100644 --- a/eng/pipelines/templates/jobs/dnup/dnup-tests.yml +++ b/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 }}' \ No newline at end of file diff --git a/sdk.slnx b/sdk.slnx index a45a43e77314..eaa4998688e9 100644 --- a/sdk.slnx +++ b/sdk.slnx @@ -95,7 +95,7 @@ - + @@ -319,13 +319,13 @@ - + diff --git a/src/Installer/Microsoft.Dotnet.Installation/AssemblyInfo.cs b/src/Installer/Microsoft.Dotnet.Installation/AssemblyInfo.cs index d90827d40301..c32a36f5227b 100644 --- a/src/Installer/Microsoft.Dotnet.Installation/AssemblyInfo.cs +++ b/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")] diff --git a/src/Installer/Microsoft.Dotnet.Installation/Internal/DotnetArchiveDownloader.cs b/src/Installer/Microsoft.Dotnet.Installation/Internal/DotnetArchiveDownloader.cs index 43c7e545ea80..e8ba12aaed89 100644 --- a/src/Installer/Microsoft.Dotnet.Installation/Internal/DotnetArchiveDownloader.cs +++ b/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()?.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); diff --git a/src/Installer/Microsoft.Dotnet.Installation/Internal/DotnetArchiveExtractor.cs b/src/Installer/Microsoft.Dotnet.Installation/Internal/DotnetArchiveExtractor.cs index 36d2a0711a14..c63b44469954 100644 --- a/src/Installer/Microsoft.Dotnet.Installation/Internal/DotnetArchiveExtractor.cs +++ b/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 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 { diff --git a/src/Installer/Microsoft.Dotnet.Installation/Internal/DnupUtilities.cs b/src/Installer/Microsoft.Dotnet.Installation/Internal/DotnetupUtilities.cs similarity index 98% rename from src/Installer/Microsoft.Dotnet.Installation/Internal/DnupUtilities.cs rename to src/Installer/Microsoft.Dotnet.Installation/Internal/DotnetupUtilities.cs index b36f2be9e1e6..c1d613e3b2ec 100644 --- a/src/Installer/Microsoft.Dotnet.Installation/Internal/DnupUtilities.cs +++ b/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" : ""; diff --git a/src/Installer/Microsoft.Dotnet.Installation/Internal/ReleaseManifest.cs b/src/Installer/Microsoft.Dotnet.Installation/Internal/ReleaseManifest.cs index 6b1f78d77ae0..2c29a86f171c 100644 --- a/src/Installer/Microsoft.Dotnet.Installation/Internal/ReleaseManifest.cs +++ b/src/Installer/Microsoft.Dotnet.Installation/Internal/ReleaseManifest.cs @@ -112,8 +112,8 @@ public ProductCollection GetReleasesIndex() /// 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? diff --git a/src/Installer/dnup/.gitignore b/src/Installer/dotnetup/.gitignore similarity index 100% rename from src/Installer/dnup/.gitignore rename to src/Installer/dotnetup/.gitignore diff --git a/src/Installer/dnup/.vscode/launch.json b/src/Installer/dotnetup/.vscode/launch.json similarity index 90% rename from src/Installer/dnup/.vscode/launch.json rename to src/Installer/dotnetup/.vscode/launch.json index 24246299b009..5e1eb1d116c4 100644 --- a/src/Installer/dnup/.vscode/launch.json +++ b/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", diff --git a/src/Installer/dnup/.vscode/settings.json b/src/Installer/dotnetup/.vscode/settings.json similarity index 79% rename from src/Installer/dnup/.vscode/settings.json rename to src/Installer/dotnetup/.vscode/settings.json index c9127932ea34..c5dbc2ff7853 100644 --- a/src/Installer/dnup/.vscode/settings.json +++ b/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" } \ No newline at end of file diff --git a/src/Installer/dnup/.vscode/tasks.json b/src/Installer/dotnetup/.vscode/tasks.json similarity index 89% rename from src/Installer/dnup/.vscode/tasks.json rename to src/Installer/dotnetup/.vscode/tasks.json index 541939d1dae4..65e2282e25b0 100644 --- a/src/Installer/dnup/.vscode/tasks.json +++ b/src/Installer/dotnetup/.vscode/tasks.json @@ -7,7 +7,7 @@ "type": "process", "args": [ "build", - "${workspaceFolder}/dnup.csproj", + "${workspaceFolder}/dotnetup.csproj", "/property:GenerateFullPaths=true", "/consoleloggerparameters:NoSummary", "${input:buildArgs}" @@ -24,7 +24,7 @@ "type": "process", "args": [ "publish", - "${workspaceFolder}/dnup.csproj", + "${workspaceFolder}/dotnetup.csproj", "/property:GenerateFullPaths=true", "/consoleloggerparameters:NoSummary", "${input:buildArgs}" @@ -39,7 +39,7 @@ "watch", "run", "--project", - "${workspaceFolder}/dnup.csproj", + "${workspaceFolder}/dotnetup.csproj", "${input:buildArgs}" ], "problemMatcher": "$msCompile" diff --git a/src/Installer/dnup/ArchiveInstallationValidator.cs b/src/Installer/dotnetup/ArchiveInstallationValidator.cs similarity index 93% rename from src/Installer/dnup/ArchiveInstallationValidator.cs rename to src/Installer/dotnetup/ArchiveInstallationValidator.cs index c358673007e7..f33c9eb8a3c7 100644 --- a/src/Installer/dnup/ArchiveInstallationValidator.cs +++ b/src/Installer/dotnetup/ArchiveInstallationValidator.cs @@ -32,7 +32,7 @@ public bool Validate(DotnetInstall install) return false; } - string dotnetMuxerPath = Path.Combine(installRoot, DnupUtilities.GetDotnetExeName()); + string dotnetMuxerPath = Path.Combine(installRoot, DotnetupUtilities.GetDotnetExeName()); if (!File.Exists(dotnetMuxerPath)) { return false; @@ -82,7 +82,7 @@ private bool ValidateWithHostFxr(string installRoot, ReleaseVersion resolvedVers string expectedPath = Path.Combine(installRoot, "sdk", resolvedVersion.ToString()); return environmentInfo.SdkInfo.Any(sdk => string.Equals(sdk.Version.ToString(), resolvedVersion.ToString(), StringComparison.OrdinalIgnoreCase) && - DnupUtilities.PathsEqual(sdk.Path, expectedPath)); + DotnetupUtilities.PathsEqual(sdk.Path, expectedPath)); } if (!RuntimeMonikerByComponent.TryGetValue(component, out string? runtimeMoniker)) @@ -94,7 +94,7 @@ private bool ValidateWithHostFxr(string installRoot, ReleaseVersion resolvedVers return environmentInfo.RuntimeInfo.Any(runtime => string.Equals(runtime.Name, runtimeMoniker, StringComparison.OrdinalIgnoreCase) && string.Equals(runtime.Version.ToString(), resolvedVersion.ToString(), StringComparison.OrdinalIgnoreCase) && - DnupUtilities.PathsEqual(runtime.Path, expectedRuntimePath)); + DotnetupUtilities.PathsEqual(runtime.Path, expectedRuntimePath)); } catch { diff --git a/src/Installer/dnup/CommandBase.cs b/src/Installer/dotnetup/CommandBase.cs similarity index 100% rename from src/Installer/dnup/CommandBase.cs rename to src/Installer/dotnetup/CommandBase.cs diff --git a/src/Installer/dnup/Commands/Sdk/Install/SdkInstallCommand.cs b/src/Installer/dotnetup/Commands/Sdk/Install/SdkInstallCommand.cs similarity index 98% rename from src/Installer/dnup/Commands/Sdk/Install/SdkInstallCommand.cs rename to src/Installer/dotnetup/Commands/Sdk/Install/SdkInstallCommand.cs index dffd5f8f223f..dfe465f258a1 100644 --- a/src/Installer/dnup/Commands/Sdk/Install/SdkInstallCommand.cs +++ b/src/Installer/dotnetup/Commands/Sdk/Install/SdkInstallCommand.cs @@ -39,7 +39,7 @@ public override int Execute() installPathFromGlobalJson = globalJsonInfo.SdkPath; if (installPathFromGlobalJson is not null && _installPath is not null && - !DnupUtilities.PathsEqual(installPathFromGlobalJson, _installPath)) + !DotnetupUtilities.PathsEqual(installPathFromGlobalJson, _installPath)) { // TODO: Add parameter to override error Console.Error.WriteLine($"Error: The install path specified in global.json ({installPathFromGlobalJson}) does not match the install path provided ({_installPath})."); @@ -140,7 +140,7 @@ public override int Execute() } else if (currentDotnetInstallRoot.InstallType == InstallType.User) { - if (DnupUtilities.PathsEqual(resolvedInstallPath, currentDotnetInstallRoot.Path)) + if (DotnetupUtilities.PathsEqual(resolvedInstallPath, currentDotnetInstallRoot.Path)) { // No need to prompt here, the default install is already set up. } diff --git a/src/Installer/dnup/Commands/Sdk/Install/SdkInstallCommandParser.cs b/src/Installer/dotnetup/Commands/Sdk/Install/SdkInstallCommandParser.cs similarity index 95% rename from src/Installer/dnup/Commands/Sdk/Install/SdkInstallCommandParser.cs rename to src/Installer/dotnetup/Commands/Sdk/Install/SdkInstallCommandParser.cs index 1b7c3e9c2a96..a5c118238e44 100644 --- a/src/Installer/dnup/Commands/Sdk/Install/SdkInstallCommandParser.cs +++ b/src/Installer/dotnetup/Commands/Sdk/Install/SdkInstallCommandParser.cs @@ -52,7 +52,7 @@ public static Command GetSdkInstallCommand() return SdkInstallCommand; } - // Trying to use the same command object for both "dnup install" and "dnup sdk install" causes the following exception: + // Trying to use the same command object for both "dotnetup install" and "dotnetup sdk install" causes the following exception: // System.InvalidOperationException: Command install has more than one child named "channel". // So we create a separate instance for each case private static readonly Command RootInstallCommand = ConstructCommand(); diff --git a/src/Installer/dnup/Commands/Sdk/SdkCommandParser.cs b/src/Installer/dotnetup/Commands/Sdk/SdkCommandParser.cs similarity index 100% rename from src/Installer/dnup/Commands/Sdk/SdkCommandParser.cs rename to src/Installer/dotnetup/Commands/Sdk/SdkCommandParser.cs diff --git a/src/Installer/dnup/Commands/Sdk/Update/SdkUpdateCommandParser.cs b/src/Installer/dotnetup/Commands/Sdk/Update/SdkUpdateCommandParser.cs similarity index 92% rename from src/Installer/dnup/Commands/Sdk/Update/SdkUpdateCommandParser.cs rename to src/Installer/dotnetup/Commands/Sdk/Update/SdkUpdateCommandParser.cs index 855a5a8aaa45..c0ad655fd1f9 100644 --- a/src/Installer/dnup/Commands/Sdk/Update/SdkUpdateCommandParser.cs +++ b/src/Installer/dotnetup/Commands/Sdk/Update/SdkUpdateCommandParser.cs @@ -31,7 +31,7 @@ public static Command GetSdkUpdateCommand() return SdkUpdateCommand; } - // Trying to use the same command object for both "dnup udpate" and "dnup sdk update" causes an InvalidOperationException + // Trying to use the same command object for both "dotnetup udpate" and "dotnetup sdk update" causes an InvalidOperationException // So we create a separate instance for each case private static readonly Command RootUpdateCommand = ConstructCommand(); diff --git a/src/Installer/dnup/CommonOptions.cs b/src/Installer/dotnetup/CommonOptions.cs similarity index 100% rename from src/Installer/dnup/CommonOptions.cs rename to src/Installer/dotnetup/CommonOptions.cs diff --git a/src/Installer/dnup/Constants.cs b/src/Installer/dotnetup/Constants.cs similarity index 91% rename from src/Installer/dnup/Constants.cs rename to src/Installer/dotnetup/Constants.cs index cc612544b292..4b5e123a11b7 100644 --- a/src/Installer/dnup/Constants.cs +++ b/src/Installer/dotnetup/Constants.cs @@ -4,7 +4,7 @@ namespace Microsoft.DotNet.Tools.Bootstrapper { /// - /// Shared constants for the dnup application. + /// Shared constants for the dotnetup application. /// internal static class Constants { @@ -17,7 +17,7 @@ public static class MutexNames /// Mutex used during the final installation phase to protect the manifest file and extracting folder(s). /// Mutex names MUST be valid file names on Unix. https://learn.microsoft.com/dotnet/api/system.threading.mutex.openexisting?view=net-9.0 /// - public const string ModifyInstallationStates = "Global\\DnupFinalize"; + public const string ModifyInstallationStates = "Global\\DotnetupFinalize"; } } } diff --git a/src/Installer/dnup/DotnetInstallManager.cs b/src/Installer/dotnetup/DotnetInstallManager.cs similarity index 98% rename from src/Installer/dnup/DotnetInstallManager.cs rename to src/Installer/dotnetup/DotnetInstallManager.cs index 380f5e9ca2a2..3553f531c2cf 100644 --- a/src/Installer/dnup/DotnetInstallManager.cs +++ b/src/Installer/dotnetup/DotnetInstallManager.cs @@ -40,7 +40,7 @@ public DotnetInstallManager(IEnvironmentProvider? environmentProvider = null) var installRoot = new DotnetInstallRoot(installDir, InstallerUtilities.GetDefaultInstallArchitecture()); - bool isSetAsDotnetRoot = DnupUtilities.PathsEqual(dotnetRoot, installDir); + bool isSetAsDotnetRoot = DotnetupUtilities.PathsEqual(dotnetRoot, installDir); return new(installRoot, isAdminInstall ? InstallType.Admin : InstallType.User, IsOnPath: true, isSetAsDotnetRoot); } diff --git a/src/Installer/dnup/DnupDebugHelper.cs b/src/Installer/dotnetup/DotnetupDebugHelper.cs similarity index 95% rename from src/Installer/dnup/DnupDebugHelper.cs rename to src/Installer/dotnetup/DotnetupDebugHelper.cs index 08810333fa3c..2119af73b823 100644 --- a/src/Installer/dnup/DnupDebugHelper.cs +++ b/src/Installer/dotnetup/DotnetupDebugHelper.cs @@ -8,7 +8,7 @@ namespace Microsoft.DotNet.Tools.Bootstrapper; // Copy of DebugHelper.cs in the SDK - port eventually. -internal static class DnupDebugHelper +internal static class DotnetupDebugHelper { [Conditional("DEBUG")] public static void HandleDebugSwitch(ref string[] args) diff --git a/src/Installer/dnup/DnupManifestJsonContext.cs b/src/Installer/dotnetup/DotnetupManifestJsonContext.cs similarity index 89% rename from src/Installer/dnup/DnupManifestJsonContext.cs rename to src/Installer/dotnetup/DotnetupManifestJsonContext.cs index 0c7809151c1f..cd003c259cc0 100644 --- a/src/Installer/dnup/DnupManifestJsonContext.cs +++ b/src/Installer/dotnetup/DotnetupManifestJsonContext.cs @@ -14,5 +14,5 @@ namespace Microsoft.DotNet.Tools.Bootstrapper [JsonSerializable(typeof(InstallArchitecture))] [JsonSerializable(typeof(InstallType))] [JsonSerializable(typeof(ManagementCadence))] - internal partial class DnupManifestJsonContext : JsonSerializerContext { } + internal partial class DotnetupManifestJsonContext : JsonSerializerContext { } } diff --git a/src/Installer/dnup/DnupSharedManifest.cs b/src/Installer/dotnetup/DotnetupSharedManifest.cs similarity index 78% rename from src/Installer/dnup/DnupSharedManifest.cs rename to src/Installer/dotnetup/DotnetupSharedManifest.cs index c5ffcfe9e12b..ffffffae9306 100644 --- a/src/Installer/dnup/DnupSharedManifest.cs +++ b/src/Installer/dotnetup/DotnetupSharedManifest.cs @@ -11,11 +11,11 @@ namespace Microsoft.DotNet.Tools.Bootstrapper; -internal class DnupSharedManifest : IDnupManifest +internal class DotnetupSharedManifest : IDotnetupManifest { private string ManifestPath => GetManifestPath(); - public DnupSharedManifest(string? manifestPath = null) + public DotnetupSharedManifest(string? manifestPath = null) { _customManifestPath = manifestPath; EnsureManifestExists(); @@ -26,7 +26,7 @@ private void EnsureManifestExists() if (!File.Exists(ManifestPath)) { Directory.CreateDirectory(Path.GetDirectoryName(ManifestPath)!); - File.WriteAllText(ManifestPath, JsonSerializer.Serialize(new List(), DnupManifestJsonContext.Default.ListDotnetInstall)); + File.WriteAllText(ManifestPath, JsonSerializer.Serialize(new List(), DotnetupManifestJsonContext.Default.ListDotnetInstall)); } } @@ -50,8 +50,8 @@ private string GetManifestPath() // Default location return Path.Combine( RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) : Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), - "dnup", - "dnup_manifest.json"); + "dotnetup", + "dotnetup_manifest.json"); } private void AssertHasFinalizationMutex() @@ -61,7 +61,7 @@ private void AssertHasFinalizationMutex() // implemented in ScopedMutex. This ensures we only assert based on a lock we actually obtained. if (!ScopedMutex.CurrentThreadHoldsMutex) { - throw new InvalidOperationException("The dnup manifest was accessed without holding the installation state mutex."); + throw new InvalidOperationException("The dotnetup manifest was accessed without holding the installation state mutex."); } } @@ -73,7 +73,7 @@ public IEnumerable GetInstalledVersions(IInstallationValidator? v var json = File.ReadAllText(ManifestPath); try { - var installs = JsonSerializer.Deserialize(json, DnupManifestJsonContext.Default.ListDotnetInstall); + var installs = JsonSerializer.Deserialize(json, DotnetupManifestJsonContext.Default.ListDotnetInstall); var validInstalls = installs ?? []; if (validator is not null) @@ -82,7 +82,7 @@ public IEnumerable GetInstalledVersions(IInstallationValidator? v if (invalids.Count > 0) { validInstalls = validInstalls.Except(invalids).ToList(); - var newJson = JsonSerializer.Serialize(validInstalls, DnupManifestJsonContext.Default.ListDotnetInstall); + var newJson = JsonSerializer.Serialize(validInstalls, DotnetupManifestJsonContext.Default.ListDotnetInstall); File.WriteAllText(ManifestPath, newJson); } } @@ -90,7 +90,7 @@ public IEnumerable GetInstalledVersions(IInstallationValidator? v } catch (JsonException ex) { - throw new InvalidOperationException($"The dnup manifest is corrupt or inaccessible", ex); + throw new InvalidOperationException($"The dotnetup manifest is corrupt or inaccessible", ex); } } @@ -106,7 +106,7 @@ public IEnumerable GetInstalledVersions(DotnetInstallRoot install var installedVersions = GetInstalledVersions(validator); var expectedInstallRootPath = Path.GetFullPath(installRoot.Path); var installedVersionsInRoot = installedVersions - .Where(install => DnupUtilities.PathsEqual(Path.GetFullPath(install.InstallRoot.Path!), expectedInstallRootPath)); + .Where(install => DotnetupUtilities.PathsEqual(Path.GetFullPath(install.InstallRoot.Path!), expectedInstallRootPath)); return installedVersionsInRoot; } @@ -117,7 +117,7 @@ public void AddInstalledVersion(DotnetInstall version) var installs = GetInstalledVersions().ToList(); installs.Add(version); - var json = JsonSerializer.Serialize(installs, DnupManifestJsonContext.Default.ListDotnetInstall); + var json = JsonSerializer.Serialize(installs, DotnetupManifestJsonContext.Default.ListDotnetInstall); Directory.CreateDirectory(Path.GetDirectoryName(ManifestPath)!); File.WriteAllText(ManifestPath, json); } @@ -128,8 +128,8 @@ public void RemoveInstalledVersion(DotnetInstall version) EnsureManifestExists(); var installs = GetInstalledVersions().ToList(); - installs.RemoveAll(i => DnupUtilities.PathsEqual(i.InstallRoot.Path, version.InstallRoot.Path) && i.Version.Equals(version.Version)); - var json = JsonSerializer.Serialize(installs, DnupManifestJsonContext.Default.ListDotnetInstall); + installs.RemoveAll(i => DotnetupUtilities.PathsEqual(i.InstallRoot.Path, version.InstallRoot.Path) && i.Version.Equals(version.Version)); + var json = JsonSerializer.Serialize(installs, DotnetupManifestJsonContext.Default.ListDotnetInstall); File.WriteAllText(ManifestPath, json); } } diff --git a/src/Installer/dnup/GlobalJsonContents.cs b/src/Installer/dotnetup/GlobalJsonContents.cs similarity index 100% rename from src/Installer/dnup/GlobalJsonContents.cs rename to src/Installer/dotnetup/GlobalJsonContents.cs diff --git a/src/Installer/dnup/IDotnetInstallManager.cs b/src/Installer/dotnetup/IDotnetInstallManager.cs similarity index 100% rename from src/Installer/dnup/IDotnetInstallManager.cs rename to src/Installer/dotnetup/IDotnetInstallManager.cs diff --git a/src/Installer/dnup/IDnupManifest.cs b/src/Installer/dotnetup/IDotnetupManifest.cs similarity index 94% rename from src/Installer/dnup/IDnupManifest.cs rename to src/Installer/dotnetup/IDotnetupManifest.cs index b17c026fa4d0..7720743b9c2c 100644 --- a/src/Installer/dnup/IDnupManifest.cs +++ b/src/Installer/dotnetup/IDotnetupManifest.cs @@ -7,7 +7,7 @@ namespace Microsoft.DotNet.Tools.Bootstrapper { - internal interface IDnupManifest + internal interface IDotnetupManifest { IEnumerable GetInstalledVersions(IInstallationValidator? validator = null); IEnumerable GetInstalledVersions(DotnetInstallRoot installRoot, IInstallationValidator? validator = null); diff --git a/src/Installer/dnup/IInstallationValidator.cs b/src/Installer/dotnetup/IInstallationValidator.cs similarity index 100% rename from src/Installer/dnup/IInstallationValidator.cs rename to src/Installer/dotnetup/IInstallationValidator.cs diff --git a/src/Installer/dnup/InstallType.cs b/src/Installer/dotnetup/InstallType.cs similarity index 100% rename from src/Installer/dnup/InstallType.cs rename to src/Installer/dotnetup/InstallType.cs diff --git a/src/Installer/dnup/InstallerOrchestratorSingleton.cs b/src/Installer/dotnetup/InstallerOrchestratorSingleton.cs similarity index 96% rename from src/Installer/dnup/InstallerOrchestratorSingleton.cs rename to src/Installer/dotnetup/InstallerOrchestratorSingleton.cs index 046ab2a84d2d..3d6ced5256ee 100644 --- a/src/Installer/dnup/InstallerOrchestratorSingleton.cs +++ b/src/Installer/dotnetup/InstallerOrchestratorSingleton.cs @@ -70,7 +70,7 @@ private InstallerOrchestratorSingleton() ArchiveInstallationValidator validator = new(); if (validator.Validate(install)) { - DnupSharedManifest manifestManager = new(customManifestPath); + DotnetupSharedManifest manifestManager = new(customManifestPath); manifestManager.AddInstalledVersion(install); } else @@ -87,7 +87,7 @@ private InstallerOrchestratorSingleton() /// private IEnumerable GetExistingInstalls(DotnetInstallRoot installRoot, string? customManifestPath = null) { - var manifestManager = new DnupSharedManifest(customManifestPath); + var manifestManager = new DotnetupSharedManifest(customManifestPath); // Use the overload that filters by muxer directory return manifestManager.GetInstalledVersions(installRoot); } diff --git a/src/Installer/dnup/ManagementCadence.cs b/src/Installer/dotnetup/ManagementCadence.cs similarity index 91% rename from src/Installer/dnup/ManagementCadence.cs rename to src/Installer/dotnetup/ManagementCadence.cs index 963b5bae8a2b..15eada87d455 100644 --- a/src/Installer/dnup/ManagementCadence.cs +++ b/src/Installer/dotnetup/ManagementCadence.cs @@ -5,7 +5,7 @@ namespace Microsoft.DotNet.Tools.Bootstrapper { public enum ManagementCadenceType { - DNUP, + Dotnetup, GlobalJson, Standalone } @@ -14,7 +14,7 @@ public struct ManagementCadence { public ManagementCadence() { - Type = ManagementCadenceType.DNUP; + Type = ManagementCadenceType.Dotnetup; Metadata = new Dictionary(); } public ManagementCadence(ManagementCadenceType managementStyle) : this() diff --git a/src/Installer/dnup/NonUpdatingProgressTarget.cs b/src/Installer/dotnetup/NonUpdatingProgressTarget.cs similarity index 100% rename from src/Installer/dnup/NonUpdatingProgressTarget.cs rename to src/Installer/dotnetup/NonUpdatingProgressTarget.cs diff --git a/src/Installer/dnup/Parser.cs b/src/Installer/dotnetup/Parser.cs similarity index 100% rename from src/Installer/dnup/Parser.cs rename to src/Installer/dotnetup/Parser.cs diff --git a/src/Installer/dnup/Program.cs b/src/Installer/dotnetup/Program.cs similarity index 81% rename from src/Installer/dnup/Program.cs rename to src/Installer/dotnetup/Program.cs index 4969b276d7ef..80e262f03a58 100644 --- a/src/Installer/dnup/Program.cs +++ b/src/Installer/dotnetup/Program.cs @@ -3,13 +3,13 @@ namespace Microsoft.DotNet.Tools.Bootstrapper { - internal class DnupProgram + internal class DotnetupProgram { public static int Main(string[] args) { // Handle --debug flag using the standard .NET SDK pattern // This is DEBUG-only and removes the --debug flag from args - DnupDebugHelper.HandleDebugSwitch(ref args); + DotnetupDebugHelper.HandleDebugSwitch(ref args); var parseResult = Parser.Parse(args); return Parser.Invoke(parseResult); diff --git a/src/Installer/dnup/ReleaseVersionJsonConverter.cs b/src/Installer/dotnetup/ReleaseVersionJsonConverter.cs similarity index 100% rename from src/Installer/dnup/ReleaseVersionJsonConverter.cs rename to src/Installer/dotnetup/ReleaseVersionJsonConverter.cs diff --git a/src/Installer/dnup/SpectreProgressTarget.cs b/src/Installer/dotnetup/SpectreProgressTarget.cs similarity index 100% rename from src/Installer/dnup/SpectreProgressTarget.cs rename to src/Installer/dotnetup/SpectreProgressTarget.cs diff --git a/src/Installer/dnup/Strings.resx b/src/Installer/dotnetup/Strings.resx similarity index 100% rename from src/Installer/dnup/Strings.resx rename to src/Installer/dotnetup/Strings.resx diff --git a/src/Installer/dnup/dnup.csproj b/src/Installer/dotnetup/dotnetup.csproj similarity index 97% rename from src/Installer/dnup/dnup.csproj rename to src/Installer/dotnetup/dotnetup.csproj index 8df7db2d310b..86e92d112292 100644 --- a/src/Installer/dnup/dnup.csproj +++ b/src/Installer/dotnetup/dotnetup.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/Installer/dnup/xlf/Strings.cs.xlf b/src/Installer/dotnetup/xlf/Strings.cs.xlf similarity index 100% rename from src/Installer/dnup/xlf/Strings.cs.xlf rename to src/Installer/dotnetup/xlf/Strings.cs.xlf diff --git a/src/Installer/dnup/xlf/Strings.de.xlf b/src/Installer/dotnetup/xlf/Strings.de.xlf similarity index 100% rename from src/Installer/dnup/xlf/Strings.de.xlf rename to src/Installer/dotnetup/xlf/Strings.de.xlf diff --git a/src/Installer/dnup/xlf/Strings.es.xlf b/src/Installer/dotnetup/xlf/Strings.es.xlf similarity index 100% rename from src/Installer/dnup/xlf/Strings.es.xlf rename to src/Installer/dotnetup/xlf/Strings.es.xlf diff --git a/src/Installer/dnup/xlf/Strings.fr.xlf b/src/Installer/dotnetup/xlf/Strings.fr.xlf similarity index 100% rename from src/Installer/dnup/xlf/Strings.fr.xlf rename to src/Installer/dotnetup/xlf/Strings.fr.xlf diff --git a/src/Installer/dnup/xlf/Strings.it.xlf b/src/Installer/dotnetup/xlf/Strings.it.xlf similarity index 100% rename from src/Installer/dnup/xlf/Strings.it.xlf rename to src/Installer/dotnetup/xlf/Strings.it.xlf diff --git a/src/Installer/dnup/xlf/Strings.ja.xlf b/src/Installer/dotnetup/xlf/Strings.ja.xlf similarity index 100% rename from src/Installer/dnup/xlf/Strings.ja.xlf rename to src/Installer/dotnetup/xlf/Strings.ja.xlf diff --git a/src/Installer/dnup/xlf/Strings.ko.xlf b/src/Installer/dotnetup/xlf/Strings.ko.xlf similarity index 100% rename from src/Installer/dnup/xlf/Strings.ko.xlf rename to src/Installer/dotnetup/xlf/Strings.ko.xlf diff --git a/src/Installer/dnup/xlf/Strings.pl.xlf b/src/Installer/dotnetup/xlf/Strings.pl.xlf similarity index 100% rename from src/Installer/dnup/xlf/Strings.pl.xlf rename to src/Installer/dotnetup/xlf/Strings.pl.xlf diff --git a/src/Installer/dnup/xlf/Strings.pt-BR.xlf b/src/Installer/dotnetup/xlf/Strings.pt-BR.xlf similarity index 100% rename from src/Installer/dnup/xlf/Strings.pt-BR.xlf rename to src/Installer/dotnetup/xlf/Strings.pt-BR.xlf diff --git a/src/Installer/dnup/xlf/Strings.ru.xlf b/src/Installer/dotnetup/xlf/Strings.ru.xlf similarity index 100% rename from src/Installer/dnup/xlf/Strings.ru.xlf rename to src/Installer/dotnetup/xlf/Strings.ru.xlf diff --git a/src/Installer/dnup/xlf/Strings.tr.xlf b/src/Installer/dotnetup/xlf/Strings.tr.xlf similarity index 100% rename from src/Installer/dnup/xlf/Strings.tr.xlf rename to src/Installer/dotnetup/xlf/Strings.tr.xlf diff --git a/src/Installer/dnup/xlf/Strings.zh-Hans.xlf b/src/Installer/dotnetup/xlf/Strings.zh-Hans.xlf similarity index 100% rename from src/Installer/dnup/xlf/Strings.zh-Hans.xlf rename to src/Installer/dotnetup/xlf/Strings.zh-Hans.xlf diff --git a/src/Installer/dnup/xlf/Strings.zh-Hant.xlf b/src/Installer/dotnetup/xlf/Strings.zh-Hant.xlf similarity index 100% rename from src/Installer/dnup/xlf/Strings.zh-Hant.xlf rename to src/Installer/dotnetup/xlf/Strings.zh-Hant.xlf diff --git a/src/Installer/installer.code-workspace b/src/Installer/installer.code-workspace index a38782dc9f20..1d79b9e08fd7 100644 --- a/src/Installer/installer.code-workspace +++ b/src/Installer/installer.code-workspace @@ -5,15 +5,15 @@ "name": "installer" }, { - "path": "../../test/dnup.Tests", - "name": "dnup.Tests" + "path": "../../test/dotnetup.Tests", + "name": "dotnetup.Tests" }, { "path": "../.." } ], "settings": { - "dotnet.defaultSolution": "dnup/dnup.csproj", + "dotnet.defaultSolution": "dotnetup/dotnetup.csproj", "csharp.debug.console": "integratedTerminal", "debug.terminal.clearBeforeReusing": true, "editor.formatOnSave": true, @@ -23,16 +23,16 @@ "version": "0.2.0", "configurations": [ { - "name": "Launch dnup (Default)", + "name": "Launch dotnetup (Default)", "type": "coreclr", "request": "launch", "preLaunchTask": "build", - "program": "${workspaceFolder:installer}/../../artifacts/bin/dnup/Debug/net10.0/dnup.dll", + "program": "${workspaceFolder:installer}/../../artifacts/bin/dotnetup/Debug/net10.0/dotnetup.dll", "args": [ "sdk", "install" ], - "cwd": "${workspaceFolder:installer}/dnup", + "cwd": "${workspaceFolder:installer}/dotnetup", "console": "integratedTerminal", "stopAtEntry": false, "logging": { @@ -40,32 +40,32 @@ } }, { - "name": "Run dnup tests (launch)", + "name": "Run dotnetup tests (launch)", "type": "coreclr", "request": "launch", "preLaunchTask": "build", "program": "dotnet", "args": [ "test", - "${workspaceFolder:dnup.Tests}/dnup.Tests.csproj", + "${workspaceFolder:dotnetup.Tests}/dotnetup.Tests.csproj", "/p:ContinuousIntegrationBuild=false", ], - "cwd": "${workspaceFolder:dnup.Tests}", + "cwd": "${workspaceFolder:dotnetup.Tests}", "console": "integratedTerminal", "stopAtEntry": false, "env": { - "DNUP_TEST_DEBUG": "0" + "DOTNETUP_TEST_DEBUG": "0" } }, { - "name": "Debug dnup test", + "name": "Debug dotnetup test", "type": "coreclr", "request": "launch", "preLaunchTask": "build", "program": "dotnet", "args": [ "test", - "${workspaceFolder:dnup.Tests}/dnup.Tests.csproj", + "${workspaceFolder:dotnetup.Tests}/dotnetup.Tests.csproj", "--no-build", "--filter", "FullyQualifiedName~${input:testName}", @@ -75,14 +75,14 @@ "/p:RunAnalyzers=false", "/p:NoRestore=true" ], - "cwd": "${workspaceFolder:dnup.Tests}", + "cwd": "${workspaceFolder:dotnetup.Tests}", "console": "integratedTerminal", "stopAtEntry": false, "logging": { "moduleLoad": false }, "env": { - "DNUP_TEST_DEBUG": "1" + "DOTNETUP_TEST_DEBUG": "1" } } ], @@ -96,7 +96,7 @@ { "id": "commandLineArgs", "type": "promptString", - "description": "Command line arguments for dnup (e.g., 'sdk install 9.0', 'runtime install lts', '--help')", + "description": "Command line arguments for dotnetup (e.g., 'sdk install 9.0', 'runtime install lts', '--help')", "default": "sdk install" } ] @@ -110,7 +110,7 @@ "command": "dotnet", "args": [ "build", - "dnup/dnup.csproj", + "dotnetup/dotnetup.csproj", "/property:GenerateFullPaths=true", "/consoleloggerparameters:NoSummary", "/p:ContinuousIntegrationBuild=false", @@ -140,7 +140,7 @@ "command": "dotnet", "args": [ "test", - "${workspaceFolder:dnup.Tests}/dnup.Tests.csproj", + "${workspaceFolder:dotnetup.Tests}/dotnetup.Tests.csproj", "/property:GenerateFullPaths=true", "/consoleloggerparameters:NoSummary", "/p:ContinuousIntegrationBuild=false", diff --git a/test/UnitTests.proj b/test/UnitTests.proj index 6cf3606eac7b..213f0afbb853 100644 --- a/test/UnitTests.proj +++ b/test/UnitTests.proj @@ -16,7 +16,7 @@ - + diff --git a/test/dnup.Tests/ChannelVersionResolverTests.cs b/test/dotnetup.Tests/ChannelVersionResolverTests.cs similarity index 98% rename from test/dnup.Tests/ChannelVersionResolverTests.cs rename to test/dotnetup.Tests/ChannelVersionResolverTests.cs index 9056db5f5dd4..ba2837772983 100644 --- a/test/dnup.Tests/ChannelVersionResolverTests.cs +++ b/test/dotnetup.Tests/ChannelVersionResolverTests.cs @@ -3,7 +3,7 @@ using Microsoft.Dotnet.Installation.Internal; using Xunit; -namespace Microsoft.DotNet.Tools.Dnup.Tests +namespace Microsoft.DotNet.Tools.Dotnetup.Tests { public class ChannelVersionResolverTests(ITestOutputHelper log) { diff --git a/test/dnup.Tests/DnupCollections.cs b/test/dotnetup.Tests/DnupCollections.cs similarity index 70% rename from test/dnup.Tests/DnupCollections.cs rename to test/dotnetup.Tests/DnupCollections.cs index f81f54444d47..3a796a8b5433 100644 --- a/test/dnup.Tests/DnupCollections.cs +++ b/test/dotnetup.Tests/DnupCollections.cs @@ -3,13 +3,13 @@ using Xunit; -namespace Microsoft.DotNet.Tools.Dnup.Tests; +namespace Microsoft.DotNet.Tools.Dotnetup.Tests; /// /// Collection definition that allows tests to run in parallel. /// -[CollectionDefinition("DnupInstallCollection", DisableParallelization = false)] -public class DnupInstallCollection +[CollectionDefinition("DotnetupInstallCollection", DisableParallelization = false)] +public class DotnetupInstallCollection { // This class has no code, and is never created. Its purpose is to be the place to apply // [CollectionDefinition] and all the collection settings. @@ -18,8 +18,8 @@ public class DnupInstallCollection /// /// Collection definition for reuse tests that allows tests to run in parallel. /// -[CollectionDefinition("DnupReuseCollection", DisableParallelization = false)] -public class DnupReuseCollection +[CollectionDefinition("DotnetupReuseCollection", DisableParallelization = false)] +public class DotnetupReuseCollection { // This class has no code, and is never created. Its purpose is to be the place to apply // [CollectionDefinition] and all the collection settings. @@ -28,8 +28,8 @@ public class DnupReuseCollection /// /// Collection definition for concurrency tests that allows tests to run in parallel. /// -[CollectionDefinition("DnupConcurrencyCollection", DisableParallelization = false)] -public class DnupConcurrencyCollection +[CollectionDefinition("DotnetupConcurrencyCollection", DisableParallelization = false)] +public class DotnetupConcurrencyCollection { // This class has no code, and is never created. Its purpose is to be the place to apply // [CollectionDefinition] and all the collection settings. diff --git a/test/dnup.Tests/DnupE2Etest.cs b/test/dotnetup.Tests/DnupE2Etest.cs similarity index 66% rename from test/dnup.Tests/DnupE2Etest.cs rename to test/dotnetup.Tests/DnupE2Etest.cs index cf7a823896a7..63d59d00fdb9 100644 --- a/test/dnup.Tests/DnupE2Etest.cs +++ b/test/dotnetup.Tests/DnupE2Etest.cs @@ -9,18 +9,18 @@ using FluentAssertions; using Microsoft.Deployment.DotNet.Releases; using Microsoft.DotNet.Tools.Bootstrapper; -using Microsoft.DotNet.Tools.Dnup.Tests.Utilities; +using Microsoft.DotNet.Tools.Dotnetup.Tests.Utilities; using Microsoft.Dotnet.Installation; using Xunit; using Microsoft.Dotnet.Installation.Internal; -namespace Microsoft.DotNet.Tools.Dnup.Tests; +namespace Microsoft.DotNet.Tools.Dotnetup.Tests; /// -/// Tests for installing different .NET SDK versions using dnup. +/// Tests for installing different .NET SDK versions using dotnetup. /// Each test run can happen in parallel with other tests in different collections. /// -[Collection("DnupInstallCollection")] +[Collection("DotnetupInstallCollection")] public class InstallEndToEndTests { public static IEnumerable InstallChannels => new List @@ -36,7 +36,7 @@ public class InstallEndToEndTests }; /// - /// End-to-end test for installing different .NET SDK versions using dnup. + /// End-to-end test for installing different .NET SDK versions using dotnetup. /// This test creates a temporary directory and sets the current directory to it /// to avoid conflicts with the global.json in the repository root. /// @@ -44,9 +44,9 @@ public class InstallEndToEndTests [MemberData(nameof(InstallChannels))] public void Test(string channel) { - using var testEnv = DnupTestUtilities.CreateTestEnvironment(); + using var testEnv = DotnetupTestUtilities.CreateTestEnvironment(); - // First verify what version dnup should resolve this channel to + // First verify what version dotnetup should resolve this channel to var updateChannel = new UpdateChannel(channel); var expectedVersion = new ChannelVersionResolver().Resolve( new DotnetInstallRequest( @@ -60,9 +60,9 @@ public void Test(string channel) Console.WriteLine($"Channel '{channel}' resolved to version: {expectedVersion}"); // Execute the command with explicit manifest path as a separate process - var args = DnupTestUtilities.BuildArguments(channel, testEnv.InstallPath, testEnv.ManifestPath); - (int exitCode, string output) = DnupTestUtilities.RunDnupProcess(args, captureOutput: true, workingDirectory: testEnv.TempRoot); - exitCode.Should().Be(0, $"dnup exited with code {exitCode}. Output:\n{output}"); + var args = DotnetupTestUtilities.BuildArguments(channel, testEnv.InstallPath, testEnv.ManifestPath); + (int exitCode, string output) = DotnetupTestUtilities.RunDotnetupProcess(args, captureOutput: true, workingDirectory: testEnv.TempRoot); + exitCode.Should().Be(0, $"dotnetup exited with code {exitCode}. Output:\n{output}"); Directory.Exists(testEnv.InstallPath).Should().BeTrue(); Directory.Exists(Path.GetDirectoryName(testEnv.ManifestPath)).Should().BeTrue(); @@ -71,13 +71,13 @@ public void Test(string channel) List installs = new(); using (var finalizeLock = new ScopedMutex(Constants.MutexNames.ModifyInstallationStates)) { - var manifest = new DnupSharedManifest(testEnv.ManifestPath); + var manifest = new DotnetupSharedManifest(testEnv.ManifestPath); installs = manifest.GetInstalledVersions().ToList(); } installs.Should().NotBeEmpty(); - var matchingInstalls = installs.Where(i => DnupUtilities.PathsEqual(i.InstallRoot.Path, testEnv.InstallPath)).ToList(); + var matchingInstalls = installs.Where(i => DotnetupUtilities.PathsEqual(i.InstallRoot.Path, testEnv.InstallPath)).ToList(); matchingInstalls.Should().ContainSingle(); var install = matchingInstalls[0]; @@ -100,15 +100,15 @@ public void Test(string channel) } /// -/// Tests that verify reuse behavior of dnup installations. +/// Tests that verify reuse behavior of dotnetup installations. /// Each test run can happen in parallel with other tests in different collections. /// -[Collection("DnupReuseCollection")] +[Collection("DotnetupReuseCollection")] public class ReuseEndToEndTests { /// /// Test that verifies that installing the same SDK version twice doesn't require - /// dnup to download and install it again. + /// dotnetup to download and install it again. /// [Fact] public void TestReusesExistingInstall() @@ -116,44 +116,44 @@ public void TestReusesExistingInstall() // We'll use a specific version for this test to ensure consistent results const string channel = "9.0.103"; - using var testEnv = DnupTestUtilities.CreateTestEnvironment(); - var args = DnupTestUtilities.BuildArguments(channel, testEnv.InstallPath, testEnv.ManifestPath); + using var testEnv = DotnetupTestUtilities.CreateTestEnvironment(); + var args = DotnetupTestUtilities.BuildArguments(channel, testEnv.InstallPath, testEnv.ManifestPath); - // Execute dnup to install the SDK the first time with explicit manifest path as a separate process + // Execute dotnetup to install the SDK the first time with explicit manifest path as a separate process Console.WriteLine($"First installation of {channel}"); - (int exitCode, string firstInstallOutput) = DnupTestUtilities.RunDnupProcess(args, captureOutput: true, workingDirectory: testEnv.TempRoot); + (int exitCode, string firstInstallOutput) = DotnetupTestUtilities.RunDotnetupProcess(args, captureOutput: true, workingDirectory: testEnv.TempRoot); exitCode.Should().Be(0, $"First installation failed with exit code {exitCode}. Output:\n{firstInstallOutput}"); - List firstDnupInstalls = new(); + List firstDotnetupInstalls = new(); // Verify the installation was successful using (var finalizeLock = new ScopedMutex(Constants.MutexNames.ModifyInstallationStates)) { - var manifest = new DnupSharedManifest(testEnv.ManifestPath); - firstDnupInstalls = manifest.GetInstalledVersions().ToList(); + var manifest = new DotnetupSharedManifest(testEnv.ManifestPath); + firstDotnetupInstalls = manifest.GetInstalledVersions().ToList(); } - firstDnupInstalls.Where(i => DnupUtilities.PathsEqual(i.InstallRoot.Path, testEnv.InstallPath)).Should().ContainSingle(); + firstDotnetupInstalls.Where(i => DotnetupUtilities.PathsEqual(i.InstallRoot.Path, testEnv.InstallPath)).Should().ContainSingle(); // Now install the same SDK again and capture the console output Console.WriteLine($"Installing .NET SDK {channel} again (should be skipped)"); - (exitCode, string output) = DnupTestUtilities.RunDnupProcess(args, captureOutput: true, workingDirectory: testEnv.TempRoot); + (exitCode, string output) = DotnetupTestUtilities.RunDotnetupProcess(args, captureOutput: true, workingDirectory: testEnv.TempRoot); exitCode.Should().Be(0, $"Second installation failed with exit code {exitCode}. Output:\n{output}"); // Verify the output contains a message indicating the SDK is already installed output.Should().Contain("is already installed, skipping installation", - "dnup should detect that the SDK is already installed and skip the installation"); + "dotnetup should detect that the SDK is already installed and skip the installation"); // The output should not contain download progress output.Should().NotContain("Downloading .NET SDK", - "dnup should not attempt to download the SDK again"); + "dotnetup should not attempt to download the SDK again"); List matchingInstalls = []; // Verify the installation record in the manifest hasn't changed using (var finalizeLock = new ScopedMutex(Constants.MutexNames.ModifyInstallationStates)) { - var manifest = new DnupSharedManifest(testEnv.ManifestPath); + var manifest = new DotnetupSharedManifest(testEnv.ManifestPath); var installs = manifest.GetInstalledVersions(); - matchingInstalls = installs.Where(i => DnupUtilities.PathsEqual(i.InstallRoot.Path, testEnv.InstallPath)).ToList(); + matchingInstalls = installs.Where(i => DotnetupUtilities.PathsEqual(i.InstallRoot.Path, testEnv.InstallPath)).ToList(); } // Should still only have one installation @@ -166,7 +166,7 @@ public void TestReusesExistingInstall() /// /// Tests that cover concurrent installs targeting the same install root and manifest. /// -[Collection("DnupConcurrencyCollection")] +[Collection("DotnetupConcurrencyCollection")] public class ConcurrentInstallationTests { [Fact] @@ -174,12 +174,12 @@ public async Task ConcurrentInstallsSerializeViaGlobalMutex() { const string channel = "9.0.103"; - using var testEnv = DnupTestUtilities.CreateTestEnvironment(); - var args1 = DnupTestUtilities.BuildArguments(channel, testEnv.InstallPath, testEnv.ManifestPath); - var args2 = DnupTestUtilities.BuildArguments(channel, testEnv.InstallPath, testEnv.ManifestPath); + using var testEnv = DotnetupTestUtilities.CreateTestEnvironment(); + var args1 = DotnetupTestUtilities.BuildArguments(channel, testEnv.InstallPath, testEnv.ManifestPath); + var args2 = DotnetupTestUtilities.BuildArguments(channel, testEnv.InstallPath, testEnv.ManifestPath); - var installTask1 = Task.Run(() => DnupTestUtilities.RunDnupProcess(args1, captureOutput: true, workingDirectory: testEnv.TempRoot)); - var installTask2 = Task.Run(() => DnupTestUtilities.RunDnupProcess(args2, captureOutput: true, workingDirectory: testEnv.TempRoot)); + var installTask1 = Task.Run(() => DotnetupTestUtilities.RunDotnetupProcess(args1, captureOutput: true, workingDirectory: testEnv.TempRoot)); + var installTask2 = Task.Run(() => DotnetupTestUtilities.RunDotnetupProcess(args2, captureOutput: true, workingDirectory: testEnv.TempRoot)); var results = await Task.WhenAll(installTask1, installTask2); @@ -192,8 +192,8 @@ public async Task ConcurrentInstallsSerializeViaGlobalMutex() using (var finalizeLock = new ScopedMutex(Constants.MutexNames.ModifyInstallationStates)) { - var manifest = new DnupSharedManifest(testEnv.ManifestPath); - finalInstalls = manifest.GetInstalledVersions().Where(i => DnupUtilities.PathsEqual(i.InstallRoot.Path, testEnv.InstallPath)).ToList(); + var manifest = new DotnetupSharedManifest(testEnv.ManifestPath); + finalInstalls = manifest.GetInstalledVersions().Where(i => DotnetupUtilities.PathsEqual(i.InstallRoot.Path, testEnv.InstallPath)).ToList(); } finalInstalls.Should().ContainSingle(); diff --git a/test/dnup.Tests/LibraryTests.cs b/test/dotnetup.Tests/LibraryTests.cs similarity index 91% rename from test/dnup.Tests/LibraryTests.cs rename to test/dotnetup.Tests/LibraryTests.cs index 098df5619c4c..55f621c172b6 100644 --- a/test/dnup.Tests/LibraryTests.cs +++ b/test/dotnetup.Tests/LibraryTests.cs @@ -6,9 +6,9 @@ using System.Text; using Microsoft.Dotnet.Installation; using Microsoft.Dotnet.Installation.Internal; -using Microsoft.DotNet.Tools.Dnup.Tests.Utilities; +using Microsoft.DotNet.Tools.Dotnetup.Tests.Utilities; -namespace Microsoft.DotNet.Tools.Dnup.Tests; +namespace Microsoft.DotNet.Tools.Dotnetup.Tests; public class LibraryTests { @@ -34,7 +34,7 @@ public void LatestVersionForChannelCanBeInstalled(string channel) var installer = InstallerFactory.CreateInstaller(new NullProgressTarget()); - using var testEnv = DnupTestUtilities.CreateTestEnvironment(); + using var testEnv = DotnetupTestUtilities.CreateTestEnvironment(); Log.WriteLine($"Installing to path: {testEnv.InstallPath}"); diff --git a/test/dnup.Tests/ParserTests.cs b/test/dotnetup.Tests/ParserTests.cs similarity index 96% rename from test/dnup.Tests/ParserTests.cs rename to test/dotnetup.Tests/ParserTests.cs index 20f4958472b0..73e85a233cee 100644 --- a/test/dnup.Tests/ParserTests.cs +++ b/test/dotnetup.Tests/ParserTests.cs @@ -3,7 +3,7 @@ using Microsoft.DotNet.Tools.Bootstrapper; -namespace Microsoft.DotNet.Tools.Dnup.Tests; +namespace Microsoft.DotNet.Tools.Dotnetup.Tests; public class ParserTests { diff --git a/test/dnup.Tests/Properties/AssemblyInfo.cs b/test/dotnetup.Tests/Properties/AssemblyInfo.cs similarity index 100% rename from test/dnup.Tests/Properties/AssemblyInfo.cs rename to test/dotnetup.Tests/Properties/AssemblyInfo.cs diff --git a/test/dnup.Tests/Utilities/ConsoleOutputCapture.cs b/test/dotnetup.Tests/Utilities/ConsoleOutputCapture.cs similarity index 94% rename from test/dnup.Tests/Utilities/ConsoleOutputCapture.cs rename to test/dotnetup.Tests/Utilities/ConsoleOutputCapture.cs index 854c7039495d..ef8ae759c24f 100644 --- a/test/dnup.Tests/Utilities/ConsoleOutputCapture.cs +++ b/test/dotnetup.Tests/Utilities/ConsoleOutputCapture.cs @@ -5,7 +5,7 @@ using System.IO; using System.Text; -namespace Microsoft.DotNet.Tools.Dnup.Tests.Utilities; +namespace Microsoft.DotNet.Tools.Dotnetup.Tests.Utilities; /// /// Helper class to capture console output for testing diff --git a/test/dnup.Tests/Utilities/DnupTestUtilities.cs b/test/dotnetup.Tests/Utilities/DotnetupTestUtilities.cs similarity index 76% rename from test/dnup.Tests/Utilities/DnupTestUtilities.cs rename to test/dotnetup.Tests/Utilities/DotnetupTestUtilities.cs index 44b6f760b74c..096d9534fa15 100644 --- a/test/dnup.Tests/Utilities/DnupTestUtilities.cs +++ b/test/dotnetup.Tests/Utilities/DotnetupTestUtilities.cs @@ -11,21 +11,21 @@ using Microsoft.Dotnet.Installation.Internal; using Microsoft.DotNet.Tools.Bootstrapper; -namespace Microsoft.DotNet.Tools.Dnup.Tests.Utilities; +namespace Microsoft.DotNet.Tools.Dotnetup.Tests.Utilities; /// -/// Common utilities for dnup tests +/// Common utilities for dotnetup tests /// -internal static class DnupTestUtilities +internal static class DotnetupTestUtilities { /// /// Creates a test environment with proper temporary directories /// public static TestEnvironment CreateTestEnvironment() { - string tempRoot = Path.Combine(Path.GetTempPath(), "dnup-e2e", Guid.NewGuid().ToString("N")); + string tempRoot = Path.Combine(Path.GetTempPath(), "dotnetup-e2e", Guid.NewGuid().ToString("N")); string installPath = Path.Combine(tempRoot, "dotnet-root"); - string manifestPath = Path.Combine(tempRoot, "dnup_manifest.json"); + string manifestPath = Path.Combine(tempRoot, "dotnetup_manifest.json"); // Create necessary directories Directory.CreateDirectory(tempRoot); @@ -36,7 +36,7 @@ public static TestEnvironment CreateTestEnvironment() } /// - /// Builds command line arguments for dnup + /// Builds command line arguments for dotnetup /// public static string[] BuildArguments(string channel, string installPath, string? manifestPath = null, bool disableProgress = true) { @@ -69,12 +69,12 @@ public static string[] BuildArguments(string channel, string installPath, string } /// - /// Runs the dnup executable as a separate process + /// Runs the dotnetup executable as a separate process /// - /// Command line arguments for dnup + /// Command line arguments for dotnetup /// Whether to capture and return the output /// A tuple with exit code and captured output (if requested) - public static (int exitCode, string output) RunDnupProcess(string[] args, bool captureOutput = false, string? workingDirectory = null) + public static (int exitCode, string output) RunDotnetupProcess(string[] args, bool captureOutput = false, string? workingDirectory = null) { #if DEBUG string configuration = "Debug"; @@ -83,21 +83,21 @@ public static (int exitCode, string output) RunDnupProcess(string[] args, bool c #endif string repoRoot = GetRepositoryRoot(); - string dnupPath = Path.Combine( + string dotnetupPath = Path.Combine( repoRoot, - "artifacts", "bin", "dnup", configuration, "net10.0", "dnup.dll"); + "artifacts", "bin", "dotnetup", configuration, "net10.0", "dotnetup.dll"); // Ensure path is normalized and exists - dnupPath = Path.GetFullPath(dnupPath); - if (!File.Exists(dnupPath)) + dotnetupPath = Path.GetFullPath(dotnetupPath); + if (!File.Exists(dotnetupPath)) { - throw new FileNotFoundException($"dnup executable not found at: {dnupPath}"); + throw new FileNotFoundException($"dotnetup executable not found at: {dotnetupPath}"); } using var process = new Process(); - string repoDotnet = Path.Combine(repoRoot, ".dotnet", DnupUtilities.GetDotnetExeName()); - process.StartInfo.FileName = File.Exists(repoDotnet) ? repoDotnet : DnupUtilities.GetDotnetExeName(); - process.StartInfo.Arguments = $"\"{dnupPath}\" {string.Join(" ", args.Select(a => $"\"{a}\""))}"; + string repoDotnet = Path.Combine(repoRoot, ".dotnet", DotnetupUtilities.GetDotnetExeName()); + process.StartInfo.FileName = File.Exists(repoDotnet) ? repoDotnet : DotnetupUtilities.GetDotnetExeName(); + process.StartInfo.Arguments = $"\"{dotnetupPath}\" {string.Join(" ", args.Select(a => $"\"{a}\""))}"; process.StartInfo.UseShellExecute = false; process.StartInfo.CreateNoWindow = true; process.StartInfo.RedirectStandardOutput = captureOutput; diff --git a/test/dnup.Tests/Utilities/TestEnvironment.cs b/test/dotnetup.Tests/Utilities/TestEnvironment.cs similarity index 97% rename from test/dnup.Tests/Utilities/TestEnvironment.cs rename to test/dotnetup.Tests/Utilities/TestEnvironment.cs index ef3af45e496e..702852d30016 100644 --- a/test/dnup.Tests/Utilities/TestEnvironment.cs +++ b/test/dotnetup.Tests/Utilities/TestEnvironment.cs @@ -4,7 +4,7 @@ using System; using System.IO; -namespace Microsoft.DotNet.Tools.Dnup.Tests.Utilities; +namespace Microsoft.DotNet.Tools.Dotnetup.Tests.Utilities; /// /// Represents a temporary test environment with isolated directories and environment variables diff --git a/test/dnup.Tests/Utilities/UpdateChannelExtensions.cs b/test/dotnetup.Tests/Utilities/UpdateChannelExtensions.cs similarity index 96% rename from test/dnup.Tests/Utilities/UpdateChannelExtensions.cs rename to test/dotnetup.Tests/Utilities/UpdateChannelExtensions.cs index 7c03d84164ec..85826c52a572 100644 --- a/test/dnup.Tests/Utilities/UpdateChannelExtensions.cs +++ b/test/dotnetup.Tests/Utilities/UpdateChannelExtensions.cs @@ -6,7 +6,7 @@ using Microsoft.DotNet.Tools.Bootstrapper; using Microsoft.Dotnet.Installation.Internal; -namespace Microsoft.DotNet.Tools.Dnup.Tests.Utilities; +namespace Microsoft.DotNet.Tools.Dotnetup.Tests.Utilities; /// /// Extension methods for working with UpdateChannel in tests diff --git a/test/dnup.Tests/dnup.Tests.csproj b/test/dotnetup.Tests/dotnetup.Tests.csproj similarity index 85% rename from test/dnup.Tests/dnup.Tests.csproj rename to test/dotnetup.Tests/dotnetup.Tests.csproj index d47cc410c996..f81b05abfbe9 100644 --- a/test/dnup.Tests/dnup.Tests.csproj +++ b/test/dotnetup.Tests/dotnetup.Tests.csproj @@ -9,7 +9,7 @@ - + diff --git a/test/dnup.Tests/xunit.runner.json b/test/dotnetup.Tests/xunit.runner.json similarity index 100% rename from test/dnup.Tests/xunit.runner.json rename to test/dotnetup.Tests/xunit.runner.json