Skip to content

Commit 95727a9

Browse files
authored
Change name from PSResourceGet to Microsoft.PowerShell.PSResourceGet (#1185)
1 parent a5f948a commit 95727a9

8 files changed

+16
-16
lines changed

.ci/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ stages:
103103
- checkout: ComplianceRepo
104104
clean: true
105105
- download: current
106-
artifact: 'PSResourceGet'
106+
artifact: 'Microsoft.PowerShell.PSResourceGet'
107107
- template: ci-compliance.yml@ComplianceRepo
108108
parameters:
109109
# credscan

.ci/ci_release.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ stages:
100100
$null = New-Item -Path $depsPath -ItemType Directory -Verbose
101101
}
102102
Get-ChildItem -Path (Join-Path -Path $srcPath -ChildPath "dependencies") -Filter '*.dll' | Foreach-Object {
103-
if ($_.Name -ne 'PSResourceGet.dll') {
103+
if ($_.Name -ne 'Microsoft.PowerShell.PSResourceGet.dll') {
104104
$sig = Get-AuthenticodeSignature -FilePath $_.FullName
105105
if ($sig.Status -ne 'Valid' -or $sig.SignerCertificate.Subject -notlike '*Microsoft*' -or $sig.SignerCertificate.Issuer -notlike '*Microsoft Code Signing PCA*') {
106106
# Copy for third party signing
@@ -179,7 +179,7 @@ stages:
179179
$null = New-Item -Path $depsSignedOutPath -ItemType Directory -Verbose
180180
}
181181
Get-ChildItem -Path (Join-Path -Path $srcPath -ChildPath "dependencies") -Filter '*.dll' | Foreach-Object {
182-
if ($_.Name -ne 'PSResourceGet.dll') {
182+
if ($_.Name -ne 'Microsoft.PowerShell.PSResourceGet.dll') {
183183
$sig = Get-AuthenticodeSignature -FilePath $_.FullName
184184
if ($sig.Status -eq 'Valid' -and ($sig.SignerCertificate.Subject -like '*Microsoft*' -and $sig.SignerCertificate.Issuer -like '*Microsoft Code Signing PCA*')) {
185185
# Copy already signed files directly to output
@@ -216,9 +216,9 @@ stages:
216216
if (! (Test-Path -Path $createdSignSrcPath)) {
217217
$null = New-Item -Path $createdSignSrcPath -ItemType Directory -Verbose
218218
}
219-
Copy-Item -Path (Join-Path -Path $srcPath -ChildPath "PSResourceGet.psd1") -Dest $createdSignSrcPath -Force -Verbose
219+
Copy-Item -Path (Join-Path -Path $srcPath -ChildPath "Microsoft.PowerShell.PSResourceGet.psd1") -Dest $createdSignSrcPath -Force -Verbose
220220
Copy-Item -Path (Join-Path -Path $srcPath -ChildPath "PSGet.Format.ps1xml") -Dest $createdSignSrcPath -Force -Verbose
221-
Copy-Item -Path (Join-Path -Path $srcPath -ChildPath "PSResourceGet.dll") -Dest $createdSignSrcPath -Force -Verbose
221+
Copy-Item -Path (Join-Path -Path $srcPath -ChildPath "Microsoft.PowerShell.PSResourceGet.dll") -Dest $createdSignSrcPath -Force -Verbose
222222
223223
$signOutPath = Join-Path -Path $env:AGENT_TEMPDIRECTORY -ChildPath 'CreatedFilesOut'
224224
if (! (Test-Path -Path $signOutPath)) {
@@ -290,8 +290,8 @@ stages:
290290
parameters:
291291
BuildDropPath: $(signOutPath)
292292
Build_Repository_Uri: 'https://github.com/powershell/PSResourceGet'
293-
PackageName: 'PSResourceGet'
294-
PackageVersion: '3.0.20'
293+
PackageName: 'Microsoft.PowerShell.PSResourceGet'
294+
PackageVersion: '0.5.22-beta22'
295295

296296
- pwsh: |
297297
$modulePath = Join-Path -Path $env:AGENT_TEMPDIRECTORY -ChildPath 'TempModules'
@@ -352,11 +352,11 @@ stages:
352352
- checkout: ComplianceRepo
353353
clean: true
354354
- download: current
355-
artifact: 'PSResourceGet'
355+
artifact: 'Microsoft.PowerShell.PSResourceGet'
356356
- template: assembly-module-compliance.yml@ComplianceRepo
357357
parameters:
358358
# binskim
359-
AnalyzeTarget: '$(Pipeline.Workspace)/PSResourceGet/net472/PSResourceGet.dll'
359+
AnalyzeTarget: '$(Pipeline.Workspace)/Microsoft.PowerShell.PSResourceGet/Microsoft.PowerShell.PSResourceGet.dll'
360360
AnalyzeSymPath: 'SRV*'
361361
# component-governance
362362
sourceScanPath: '$(Build.SourcesDirectory)'

.ci/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
downloadPath: '$(Pipeline.Workspace)/nuget'
2121

2222
- powershell: |
23-
$package = (Get-ChildItem '$(Pipeline.Workspace)/nuget/PSResourceGet.*.nupkg').FullName
23+
$package = (Get-ChildItem '$(Pipeline.Workspace)/nuget/Microsoft.PowerShell.PSResourceGet.*.nupkg').FullName
2424
$package
2525
$vstsCommandString = "vso[task.setvariable variable=NugetPkgPath]${package}"
2626
Write-Host "sending " + $vstsCommandString

doBuild.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ function DoBuild
6868

6969
# Place build results
7070
$assemblyNames = @(
71-
'PSResourceGet'
71+
'Microsoft.PowerShell.PSResourceGet'
7272
)
7373

7474
$depAssemblyNames = @(

package.config.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"ModuleName": "PSResourceGet",
2+
"ModuleName": "Microsoft.PowerShell.PSResourceGet",
33
"FormatFileName": "PSGet.Format",
44
"Culture": "en-US",
55
"BuildOutputPath": "out",

src/PSResourceGet.psd1 renamed to src/Microsoft.PowerShell.PSResourceGet.psd1

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Licensed under the MIT License.
33

44
@{
5-
RootModule = './PSResourceGet.dll'
5+
RootModule = './Microsoft.PowerShell.PSResourceGet.dll'
66
ModuleVersion = '0.5.22'
77
CompatiblePSEditions = @('Core', 'Desktop')
88
GUID = 'e4e0bda1-0703-44a5-b70d-8fe704cd0643'

src/code/PSResourceGet.csproj renamed to src/code/Microsoft.PowerShell.PSResourceGet.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
<PropertyGroup>
55
<OutputType>Library</OutputType>
6-
<RootNamespace>PSResourceGet</RootNamespace>
7-
<AssemblyName>PSResourceGet</AssemblyName>
6+
<RootNamespace>Microsoft.PowerShell.PSResourceGet</RootNamespace>
7+
<AssemblyName>Microsoft.PowerShell.PSResourceGet</AssemblyName>
88
<AssemblyVersion>0.5.22.0</AssemblyVersion>
99
<FileVersion>0.5.22</FileVersion>
1010
<InformationalVersion>0.5.22</InformationalVersion>

src/code/Utils.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1369,7 +1369,7 @@ public static Collection<T> InvokeScriptWithHost<T>(
13691369
iss.LanguageMode = PSLanguageMode.FullLanguage;
13701370
// Import the current PowerShellGet module.
13711371
var modPathObjects = cmdlet.InvokeCommand.InvokeScript(
1372-
script: "(Get-Module -Name PSResourceGet).Path");
1372+
script: "(Microsoft.PowerShell.Core\\Get-Module -Name Microsoft.PowerShell.PSResourceGet).Path");
13731373
string modPath = (modPathObjects.Count > 0 &&
13741374
modPathObjects[0].BaseObject is string modPathStr)
13751375
? modPathStr : string.Empty;

0 commit comments

Comments
 (0)