Skip to content

Commit c0ff42d

Browse files
dsplaisteddsplaisted
authored
Rename dnup to dotnetup (#51808)
2 parents edafb51 + 0c33b1d commit c0ff42d

File tree

69 files changed

+185
-182
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+185
-182
lines changed

‎.vsts-dnup-ci.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,14 @@ trigger:
66
include:
77
- dnup
88
- release/dnup
9+
- release/dotnetup
910

1011
pr:
1112
branches:
1213
include:
1314
- dnup
1415
- release/dnup
16+
- release/dotnetup
1517

1618
parameters:
1719
# When true, runs the pipeline in the same way as the PR pipeline.
@@ -91,10 +93,10 @@ extends:
9193

9294
stages:
9395
- stage: tests
94-
displayName: 🧪 dnup tests
96+
displayName: 🧪 dotnetup tests
9597
jobs:
9698
### Windows ###
97-
- template: /eng/pipelines/templates/jobs/dnup/dnup-tests.yml@self
99+
- template: /eng/pipelines/templates/jobs/dotnetup/dotnetup-tests.yml@self
98100
parameters:
99101
pool:
100102
name: $(DncEngInternalBuildPool)
@@ -125,10 +127,10 @@ extends:
125127
_SignType: real
126128
### Packaging ###
127129
- stage: package
128-
displayName: 📦 Package dnup
130+
displayName: 📦 Package dotnetup
129131
dependsOn: []
130132
jobs:
131-
- template: /eng/pipelines/templates/jobs/dnup/dnup-library-package.yml@self
133+
- template: /eng/pipelines/templates/jobs/dotnetup/dotnetup-library-package.yml@self
132134
parameters:
133135
pool:
134136
name: $(DncEngInternalBuildPool)

‎.vsts-dnup-pr.yml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ pr:
77
include:
88
- dnup
99
- release/dnup
10+
- release/dotnetup
1011

1112
parameters:
1213
- name: enableArm64Job
@@ -20,11 +21,11 @@ variables:
2021
- template: /eng/common/templates/variables/pool-providers.yml
2122

2223
stages:
23-
- stage: dnup
24-
displayName: 🏰 dnup tests
24+
- stage: dotnetup
25+
displayName: 🏰 dotnetup tests
2526
jobs:
2627
############### WINDOWS ###############
27-
- template: /eng/pipelines/templates/jobs/dnup/dnup-tests.yml@self
28+
- template: /eng/pipelines/templates/jobs/dotnetup/dotnetup-tests.yml@self
2829
parameters:
2930
pool:
3031
name: $(DncEngPublicBuildPool)
@@ -34,7 +35,7 @@ stages:
3435
helixTargetQueue: windows.amd64.vs2022.pre.open
3536

3637
############### LINUX ###############
37-
- template: /eng/pipelines/templates/jobs/dnup/dnup-tests.yml@self
38+
- template: /eng/pipelines/templates/jobs/dotnetup/dotnetup-tests.yml@self
3839
parameters:
3940
pool:
4041
name: $(DncEngPublicBuildPool)
@@ -44,7 +45,7 @@ stages:
4445
helixTargetQueue: ubuntu.2204.amd64.open
4546

4647
############### MACOS ###############
47-
- template: /eng/pipelines/templates/jobs/dnup/dnup-tests.yml@self
48+
- template: /eng/pipelines/templates/jobs/dotnetup/dotnetup-tests.yml@self
4849
parameters:
4950
pool:
5051
name: Azure Pipelines
@@ -55,7 +56,7 @@ stages:
5556

5657
### ARM64 ###
5758
- ${{ if eq(parameters.enableArm64Job, true) }}:
58-
- template: /eng/pipelines/templates/jobs/dnup/dnup-tests.yml@self
59+
- template: /eng/pipelines/templates/jobs/dotnetup/dotnetup-tests.yml@self
5960
parameters:
6061
pool:
6162
name: Azure Pipelines

‎.vsts-pr.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ pr:
1515
- CODEOWNERS
1616
- .vsts-dnup-ci.yml
1717
- .vsts-dnup-pr.yml
18-
- /eng/pipelines/templates/jobs/dnup/*
18+
- /eng/pipelines/templates/jobs/dotnetup/*
1919
- src/Installer/*
20-
- test/dnup.Tests/*
20+
- test/dotnetup.Tests/*
2121

2222
parameters:
2323
- name: enableArm64Job

‎dnup.slnf‎ renamed to ‎dotnetup.slnf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
"solution": {
33
"path": "sdk.slnx",
44
"projects": [
5-
"src\\Installer\\dnup\\dnup.csproj",
5+
"src\\Installer\\dotnetup\\dotnetup.csproj",
66
"src\\Installer\\Microsoft.Dotnet.Installation\\Microsoft.Dotnet.Installation.csproj",
7-
"test\\dnup.Tests\\dnup.Tests.csproj",
7+
"test\\dotnetup.Tests\\dotnetup.Tests.csproj",
88
"src\\Resolvers\\Microsoft.DotNet.NativeWrapper\\Microsoft.DotNet.NativeWrapper.csproj"
99
]
1010
}

‎eng/pipelines/templates/jobs/dnup/dnup-library-package.yml‎ renamed to ‎eng/pipelines/templates/jobs/dotnetup/dotnetup-library-package.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ parameters:
88
publishTaskPrefix: ''
99
container: ''
1010
helixTargetContainer: ''
11-
categoryName: dnup
11+
categoryName: dotnetup
1212
runTests: true
1313
publishRetryConfig: false
1414
publishXunitResults: false
@@ -18,7 +18,7 @@ parameters:
1818
jobs:
1919
- template: /eng/common/${{ parameters.oneESCompat.templateFolderName }}/job/job.yml
2020
parameters:
21-
displayName: '${{ parameters.pool.emoji }} dnup package: ${{ parameters.pool.os }} (${{ parameters.helixTargetQueue }})'
21+
displayName: '${{ parameters.pool.emoji }} dotnetup package: ${{ parameters.pool.os }} (${{ parameters.helixTargetQueue }})'
2222
pool: ${{ parameters.pool }}
2323
container: ${{ parameters.container }}
2424
strategy: ${{ parameters.strategy }}
@@ -41,31 +41,31 @@ jobs:
4141
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;
4242
outputs:
4343
- output: pipelineArtifact
44-
displayName: '🌐 Publish dnup library packages'
44+
displayName: '🌐 Publish dotnetup library packages'
4545
condition: always()
4646
targetPath: '$(Build.SourcesDirectory)/artifacts/packages/Release/NonShipping/'
47-
artifactName: 'dnup-library-packages'
47+
artifactName: 'dotnetup-library-packages'
4848
publishLocation: Container
4949
- output: pipelineArtifact
50-
displayName: '📊 Publish dnup library build binlogs'
50+
displayName: '📊 Publish dotnetup library build binlogs'
5151
condition: always()
5252
targetPath: '$(Build.SourcesDirectory)/artifacts/binlogs/'
53-
artifactName: 'dnup-library-binlogs'
53+
artifactName: 'dotnetup-library-binlogs'
5454
publishLocation: Container
5555
steps:
5656
- ${{ if eq(parameters.pool.os, 'windows') }}:
5757
- powershell: |
5858
& .\restore.cmd $(_officialBuildProperties)
5959
displayName: 🍱 Bootstrap toolset (Windows)
6060
- powershell: |
61-
& .\.dotnet\dotnet build test\dnup.Tests\dnup.Tests.csproj -c Release -bl:$(Build.SourcesDirectory)/artifacts/binlogs/dnup-library-build.binlog $(_officialBuildProperties)
61+
& .\.dotnet\dotnet build test\dotnetup.Tests\dotnetup.Tests.csproj -c Release -bl:$(Build.SourcesDirectory)/artifacts/binlogs/dotnetup-library-build.binlog $(_officialBuildProperties)
6262
displayName: 💻 Build Windows
6363
- powershell: |
64-
& .\.dotnet\dotnet pack .\src\Installer\Microsoft.Dotnet.Installation\Microsoft.Dotnet.Installation.csproj -bl:$(Build.SourcesDirectory)/artifacts/binlogs/dnup-library-package.binlog $(_officialBuildProperties)
65-
displayName: 📦 Package dnup library
64+
& .\.dotnet\dotnet pack .\src\Installer\Microsoft.Dotnet.Installation\Microsoft.Dotnet.Installation.csproj -bl:$(Build.SourcesDirectory)/artifacts/binlogs/dotnetup-library-package.binlog $(_officialBuildProperties)
65+
displayName: 📦 Package dotnetup library
6666
- powershell: |
67-
& .\.dotnet\dotnet build .\src\Installer\Installer.sign.proj /t:Sign -bl:$(Build.SourcesDirectory)/artifacts/binlogs/dnup-library-sign.binlog $(_officialBuildProperties)
68-
displayName: 🖋️ Sign dnup library packages with arcade signtool
67+
& .\.dotnet\dotnet build .\src\Installer\Installer.sign.proj /t:Sign -bl:$(Build.SourcesDirectory)/artifacts/binlogs/dotnetup-library-sign.binlog $(_officialBuildProperties)
68+
displayName: 🖋️ Sign dotnetup library packages with arcade signtool
6969
- task: 1ES.PublishNuget@1
7070
displayName: 🟣 Publish packages to AzDO
7171
inputs:

‎eng/pipelines/templates/jobs/dnup/dnup-tests.yml‎ renamed to ‎eng/pipelines/templates/jobs/dotnetup/dotnetup-tests.yml‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ parameters:
88
publishTaskPrefix: ''
99
container: ''
1010
helixTargetContainer: ''
11-
categoryName: dnup
11+
categoryName: dotnetup
1212
runTests: true
1313
publishRetryConfig: false
1414
publishXunitResults: false
@@ -18,7 +18,7 @@ parameters:
1818
jobs:
1919
- template: /eng/common/${{ parameters.oneESCompat.templateFolderName }}/job/job.yml
2020
parameters:
21-
displayName: '${{ parameters.pool.emoji }} dnup tests: ${{ parameters.pool.os }} (${{ parameters.helixTargetQueue }})'
21+
displayName: '${{ parameters.pool.emoji }} dotnetup tests: ${{ parameters.pool.os }} (${{ parameters.helixTargetQueue }})'
2222
pool: ${{ parameters.pool }}
2323
container: ${{ parameters.container }}
2424
strategy: ${{ parameters.strategy }}
@@ -41,8 +41,8 @@ jobs:
4141
- output: pipelineArtifact
4242
displayName: '🌐 Publish Test Artifacts'
4343
condition: always()
44-
targetPath: '$(Build.SourcesDirectory)/artifacts/dnupTestResults'
45-
artifactName: 'dnupTestResults_${{ parameters.pool.os }}'
44+
targetPath: '$(Build.SourcesDirectory)/artifacts/dotnetupTestResults'
45+
artifactName: 'dotnetupTestResults_${{ parameters.pool.os }}'
4646
publishLocation: Container
4747

4848
steps:
@@ -51,38 +51,38 @@ jobs:
5151
& .\restore.cmd
5252
displayName: 🍱 Bootstrap toolset (Windows)
5353
- powershell: |
54-
& .\.dotnet\dotnet restore test\dnup.Tests\dnup.Tests.csproj
55-
displayName: ♻️ Restore dnup tests (Windows)
54+
& .\.dotnet\dotnet restore test\dotnetup.Tests\dotnetup.Tests.csproj
55+
displayName: ♻️ Restore dotnetup tests (Windows)
5656
- powershell: |
57-
& .\.dotnet\dotnet build test\dnup.Tests\dnup.Tests.csproj -c Release --no-restore
57+
& .\.dotnet\dotnet build test\dotnetup.Tests\dotnetup.Tests.csproj -c Release --no-restore
5858
displayName: 💻 Build Windows
5959
- powershell: |
60-
New-Item -Path "$(Build.SourcesDirectory)/artifacts/dnupTestResults" -ItemType Directory -Force
60+
New-Item -Path "$(Build.SourcesDirectory)/artifacts/dotnetupTestResults" -ItemType Directory -Force
6161
displayName: 📁 Create test results directory (Windows)
6262
- powershell: |
63-
& .\.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
63+
& .\.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
6464
displayName: 🔍 Test Windows
6565
- ${{ if ne(parameters.pool.os, 'windows') }}:
6666
- script: |
6767
./restore.sh
6868
displayName: 🍱 Bootstrap toolset (Unix)
6969
- script: |
70-
./.dotnet/dotnet restore test/dnup.Tests/dnup.Tests.csproj
71-
displayName: ♻️ Restore dnup tests (Unix)
70+
./.dotnet/dotnet restore test/dotnetup.Tests/dotnetup.Tests.csproj
71+
displayName: ♻️ Restore dotnetup tests (Unix)
7272
- script: |
73-
./.dotnet/dotnet build test/dnup.Tests/dnup.Tests.csproj -c Release --no-restore
73+
./.dotnet/dotnet build test/dotnetup.Tests/dotnetup.Tests.csproj -c Release --no-restore
7474
displayName: 🐧 Build (Unix)
7575
- script: |
76-
mkdir -p "$(Build.SourcesDirectory)/artifacts/dnupTestResults"
76+
mkdir -p "$(Build.SourcesDirectory)/artifacts/dotnetupTestResults"
7777
displayName: 📁 Create test results directory (Unix)
7878
- script: |
79-
./.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
79+
./.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
8080
displayName: 🔎 Test (Unix)
8181
- task: PublishTestResults@2
8282
displayName: 🚀 Publish test results
8383
condition: always()
8484
inputs:
8585
testResultsFormat: VSTest
86-
testResultsFiles: '**/dnup-tests.trx'
87-
searchFolder: $(Build.SourcesDirectory)/artifacts/dnupTestResults
88-
testRunTitle: 'dnup ${{ parameters.pool.os }}'
86+
testResultsFiles: '**/dotnetup-tests.trx'
87+
searchFolder: $(Build.SourcesDirectory)/artifacts/dotnetupTestResults
88+
testRunTitle: 'dotnetup ${{ parameters.pool.os }}'

‎sdk.slnx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
<Project Path="src/Containers/packaging/package.csproj" />
9696
</Folder>
9797
<Folder Name="/src/Installer/">
98-
<Project Path="src/Installer/dnup/dnup.csproj" />
98+
<Project Path="src/Installer/dotnetup/dotnetup.csproj" />
9999
<Project Path="src/Installer/Microsoft.Dotnet.Installation/Microsoft.Dotnet.Installation.csproj" />
100100
</Folder>
101101
<Folder Name="/src/Layout/">
@@ -319,13 +319,13 @@
319319
<Project Path="test/ArgumentForwarding.Tests/ArgumentForwarding.Tests.csproj" />
320320
<Project Path="test/ArgumentsReflector/ArgumentsReflector.csproj" />
321321
<Project Path="test/containerize.UnitTests/containerize.UnitTests.csproj" />
322-
<Project Path="test/dnup.Tests/dnup.Tests.csproj" />
323322
<Project Path="test/dotnet-format.UnitTests/dotnet-format.UnitTests.csproj" />
324323
<Project Path="test/dotnet-MsiInstallation.Tests/dotnet-MsiInstallation.Tests.csproj" />
325324
<Project Path="test/dotnet-new.IntegrationTests/dotnet-new.IntegrationTests.csproj" />
326325
<Project Path="test/dotnet-watch-test-browser/dotnet-watch-test-browser.csproj" />
327326
<Project Path="test/dotnet-watch.Tests/dotnet-watch.Tests.csproj" />
328327
<Project Path="test/dotnet.Tests/dotnet.Tests.csproj" />
328+
<Project Path="test/dotnetup.Tests/dotnetup.Tests.csproj" />
329329
<Project Path="test/EndToEnd.Tests/EndToEnd.Tests.csproj" />
330330
<Project Path="test/HelixTasks/HelixTasks.csproj" />
331331
<Project Path="test/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests.csproj" />

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
using System.Runtime.CompilerServices;
77
using System.Text;
88

9-
[assembly: InternalsVisibleTo("dnup, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
10-
[assembly: InternalsVisibleTo("dnup.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
9+
[assembly: InternalsVisibleTo("dotnetup, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
10+
[assembly: InternalsVisibleTo("dotnetup.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,10 @@ private static HttpClient CreateDefaultHttpClient()
6868
Timeout = TimeSpan.FromMinutes(10)
6969
};
7070

71-
// Set user-agent to identify dnup in telemetry, including version
71+
// Set user-agent to identify dotnetup in telemetry, including version
7272
var informationalVersion = typeof(DotnetArchiveDownloader).Assembly
7373
.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion;
74-
string userAgent = informationalVersion == null ? "dotnetup-dotnet-installer" : $"dnup-dotnet-installer/{informationalVersion}";
74+
string userAgent = informationalVersion == null ? "dotnetup-dotnet-installer" : $"dotnetup-dotnet-installer/{informationalVersion}";
7575

7676
client.DefaultRequestHeaders.UserAgent.ParseAdd(userAgent);
7777

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public void Prepare()
3636

3737
using var archiveDownloader = new DotnetArchiveDownloader();
3838
var archiveName = $"dotnet-{Guid.NewGuid()}";
39-
_archivePath = Path.Combine(scratchDownloadDirectory, archiveName + DnupUtilities.GetArchiveFileExtensionForPlatform());
39+
_archivePath = Path.Combine(scratchDownloadDirectory, archiveName + DotnetupUtilities.GetArchiveFileExtensionForPlatform());
4040

4141
using (var progressReporter = _progressTarget.CreateProgressReporter())
4242
{
@@ -105,7 +105,7 @@ private MuxerHandlingConfig ConfigureMuxerHandling(IEnumerable<ReleaseVersion> e
105105
ReleaseVersion newRuntimeVersion = _resolvedVersion;
106106
bool shouldUpdateMuxer = existingMuxerVersion is null || newRuntimeVersion.CompareTo(existingMuxerVersion) > 0;
107107

108-
string muxerName = DnupUtilities.GetDotnetExeName();
108+
string muxerName = DotnetupUtilities.GetDotnetExeName();
109109
string muxerTargetPath = Path.Combine(_request.InstallRoot.Path!, muxerName);
110110

111111
return new MuxerHandlingConfig(
@@ -253,7 +253,7 @@ private void HandleMuxerUpdateFromTar(TarEntry entry, string muxerTargetPath)
253253
try
254254
{
255255
// Replace the muxer using the utility that handles locking
256-
DnupUtilities.ForceReplaceFile(tempMuxerPath, muxerTargetPath);
256+
DotnetupUtilities.ForceReplaceFile(tempMuxerPath, muxerTargetPath);
257257
}
258258
finally
259259
{
@@ -335,7 +335,7 @@ private void HandleMuxerUpdateFromZip(ZipArchiveEntry entry, string muxerTargetP
335335
try
336336
{
337337
// Replace the muxer using the utility that handles locking
338-
DnupUtilities.ForceReplaceFile(tempMuxerPath, muxerTargetPath);
338+
DotnetupUtilities.ForceReplaceFile(tempMuxerPath, muxerTargetPath);
339339
}
340340
finally
341341
{

0 commit comments

Comments
 (0)