Skip to content

Commit

Permalink
Rename Module and project to Microsoft.PowerShell.GraphicalTools
Browse files Browse the repository at this point in the history
  • Loading branch information
TylerLeonhardt committed Aug 13, 2019
1 parent 5b5aeef commit a492e90
Show file tree
Hide file tree
Showing 10 changed files with 27 additions and 26 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Expand Up @@ -40,4 +40,4 @@ module/
.dotnet

# Ignore package
GraphicalTools.zip
Microsoft.PowerShell.GraphicalTools.zip
14 changes: 7 additions & 7 deletions .vsts-ci/azure-pipelines-release.yml
Expand Up @@ -66,7 +66,7 @@ jobs:
inputs:
scriptType: inlineScript
inlineScript: |
Expand-Archive -Path "$env:BUILD_ARTIFACTSTAGINGDIRECTORY\GraphicalTools\GraphicalTools-Windows_NT.zip" -DestinationPath "$env:BUILD_ARTIFACTSTAGINGDIRECTORY\GraphicalTools"
Expand-Archive -Path "$env:BUILD_ARTIFACTSTAGINGDIRECTORY\Microsoft.PowerShell.GraphicalTools\Microsoft.PowerShell.GraphicalTools-Windows_NT.zip" -DestinationPath "$env:BUILD_ARTIFACTSTAGINGDIRECTORY\Microsoft.PowerShell.GraphicalTools"
- task: PkgESCodeSign@10
displayName: 'CodeSign tools/releaseBuild/signing.xml'
Expand All @@ -82,17 +82,17 @@ jobs:
inputs:
scriptType: inlineScript
inlineScript: |
$signed="$env:BUILD_ARTIFACTSTAGINGDIRECTORY\Signed\GraphicalTools\*"
$notSigned="$env:BUILD_ARTIFACTSTAGINGDIRECTORY\GraphicalTools"
$signed="$env:BUILD_ARTIFACTSTAGINGDIRECTORY\Signed\Microsoft.PowerShell.GraphicalTools\*"
$notSigned="$env:BUILD_ARTIFACTSTAGINGDIRECTORY\Microsoft.PowerShell.GraphicalTools"
Copy-Item $signed $notSigned -Recurse -Force
- task: PowerShell@1
displayName: 'Create catalog file'
inputs:
scriptType: inlineScript
inlineScript: |
$signedDir = "$env:BUILD_ARTIFACTSTAGINGDIRECTORY\GraphicalTools\GraphicalTools"
New-FileCatalog -CatalogFilePath "$env:BUILD_ARTIFACTSTAGINGDIRECTORY\GraphicalTools\GraphicalTools.cat" -Path "$signedDir"
$signedDir = "$env:BUILD_ARTIFACTSTAGINGDIRECTORY\Microsoft.PowerShell.GraphicalTools\Microsoft.PowerShell.GraphicalTools"
New-FileCatalog -CatalogFilePath "$env:BUILD_ARTIFACTSTAGINGDIRECTORY\Microsoft.PowerShell.GraphicalTools\Microsoft.PowerShell.GraphicalTools.cat" -Path "$signedDir"
- task: PkgESCodeSign@10
displayName: 'CodeSign tools/releaseBuild/FileCatalogSigning.xml'
Expand Down Expand Up @@ -137,7 +137,7 @@ jobs:
InputType: 'Basic'
Function: 'analyze'
AnalyzeRecurse: true
AnalyzeTarget: '$(Build.ArtifactStagingDirectory)\GraphicalToolsModule.dll;$(Build.ArtifactStagingDirectory)\OutGridView*.dll'
AnalyzeTarget: '$(Build.ArtifactStagingDirectory)\Microsoft.PowerShell.GraphicalTools.dll;$(Build.ArtifactStagingDirectory)\OutGridView*.dll'

# Publish results as artifacts
- task: PublishSecurityAnalysisLogs@3
Expand Down Expand Up @@ -172,4 +172,4 @@ jobs:
condition: succeededOrFailed()
inputs:
scriptType: inlineScript
inlineScript: 'Write-Host "##vso[artifact.upload containerfolder=GraphicalTools-Signed;artifactname=GraphicalTools-Signed]$(Build.ArtifactStagingDirectory)\GraphicalTools\GraphicalTools"'
inlineScript: 'Write-Host "##vso[artifact.upload containerfolder=Microsoft.PowerShell.GraphicalTools-Signed;artifactname=Microsoft.PowerShell.GraphicalTools-Signed]$(Build.ArtifactStagingDirectory)\Microsoft.PowerShell.GraphicalTools\Microsoft.PowerShell.GraphicalTools"'
2 changes: 1 addition & 1 deletion .vsts-ci/templates/ci-general.yml
Expand Up @@ -21,5 +21,5 @@ steps:
condition: succeededOrFailed()
- task: PublishBuildArtifacts@1
inputs:
ArtifactName: GraphicalTools
ArtifactName: Microsoft.PowerShell.GraphicalTools
PathtoPublish: '$(Build.ArtifactStagingDirectory)'
2 changes: 1 addition & 1 deletion Build.ps1
@@ -1,2 +1,2 @@
Invoke-Build Build
pwsh -c "Import-Module '$PSScriptRoot/module/GraphicalTools'; Get-Process | Out-GridView -PassThru"
pwsh -c "Import-Module '$PSScriptRoot/module/Microsoft.PowerShell.GraphicalTools'; Get-Process | Out-GridView -PassThru"
29 changes: 15 additions & 14 deletions GraphicalTools.build.ps1
@@ -1,18 +1,19 @@

$script:IsUnix = $PSVersionTable.PSEdition -and $PSVersionTable.PSEdition -eq "Core" -and !$IsWindows

$script:ModuleBinPath = "$PSScriptRoot/module/GraphicalTools/"
$script:ModuleName = "Microsoft.PowerShell.GraphicalTools"
$script:ModuleBinPath = "$PSScriptRoot/module/$script:ModuleName/"
$script:TargetFramework = "netcoreapp3.0"
$script:RequiredSdkVersion = "3.0.100-preview5-011568"
$script:Configuration = "Debug"
$script:TargetPlatforms = @("win-x64", "osx-x64", "linux-x64")

$script:RequiredBuildAssets = @{
$script:ModuleBinPath = @{
'GraphicalToolsModule' = @(
'publish/GraphicalToolsModule.dll',
'publish/GraphicalToolsModule.pdb',
'publish/GraphicalTools.psd1'
$script:ModuleName = @(
"publish/$script:ModuleName.dll",
"publish/$script:ModuleName.pdb",
"publish/$script:ModuleName.psd1"
)

'OutGridView.Models' = @(
Expand Down Expand Up @@ -96,7 +97,7 @@ task SetupDotNet -Before Clean, Build {
task Build {
Remove-Item $PSScriptRoot/module -Recurse -Force -ErrorAction Ignore

exec { & $script:dotnetExe publish -c $script:Configuration "$PSScriptRoot/src/GraphicalToolsModule/GraphicalToolsModule.csproj" }
exec { & $script:dotnetExe publish -c $script:Configuration "$PSScriptRoot/src/$script:ModuleName/$script:ModuleName.csproj" }
exec { & $script:dotnetExe publish -c $script:Configuration "$PSScriptRoot/src/OutGridView.Models/OutGridView.Models.csproj" }


Expand All @@ -114,11 +115,11 @@ task Clean {
#Remove Module Build
Remove-Item $PSScriptRoot/module -Recurse -Force -ErrorAction Ignore

exec { & $script:dotnetExe clean -c $script:Configuration "$PSScriptRoot/src/GraphicalToolsModule/GraphicalToolsModule.csproj" }
exec { & $script:dotnetExe clean -c $script:Configuration "$PSScriptRoot/src/$script:ModuleName/$script:ModuleName.csproj" }
exec { & $script:dotnetExe clean -c $script:Configuration "$PSScriptRoot/src/OutGridView.Models/OutGridView.Models.csproj" }
exec { & $script:dotnetExe clean -c $script:Configuration "$PSScriptRoot/src/OutGridView.Gui/OutGridView.Gui.csproj" }

Get-ChildItem $PSScriptRoot\module\GraphicalTools\Commands\en-US\*-help.xml -ErrorAction Ignore | Remove-Item -Force -ErrorAction Ignore
Get-ChildItem "$PSScriptRoot\module\$script:ModuleName\Commands\en-US\*-help.xml" -ErrorAction Ignore | Remove-Item -Force -ErrorAction Ignore
}

task LayoutModule -After Build {
Expand Down Expand Up @@ -157,21 +158,21 @@ task LayoutModule -After Build {
}
}

Copy-Item -Force "$PSScriptRoot/README.md" "$PSScriptRoot/module/GraphicalTools"
Copy-Item -Force "$PSScriptRoot/LICENSE.txt" "$PSScriptRoot/module/GraphicalTools"
Copy-Item -Force "$PSScriptRoot/README.md" $script:ModuleBinPath
Copy-Item -Force "$PSScriptRoot/LICENSE.txt" $script:ModuleBinPath
}

task BuildCmdletHelp {
New-ExternalHelp -Path $PSScriptRoot\docs -OutputPath $PSScriptRoot\module\GraphicalTools\en-US -Force
New-ExternalHelp -Path "$PSScriptRoot/docs" -OutputPath "$script:ModuleBinPath/en-US" -Force
}

task PackageModule {
Remove-Item "$PSScriptRoot/GraphicalTools.zip" -Force -ErrorAction Ignore
Compress-Archive -Path "$PSScriptRoot/module/GraphicalTools" -DestinationPath GraphicalTools.zip -CompressionLevel Optimal -Force
Remove-Item "$PSScriptRoot/$script:ModuleName.zip" -Force -ErrorAction Ignore
Compress-Archive -Path $script:ModuleBinPath -DestinationPath "$script:ModuleName.zip" -CompressionLevel Optimal -Force
}

task UploadArtifacts -If ($null -ne $env:TF_BUILD) {
Copy-Item -Path ".\GraphicalTools.zip" -Destination "$env:BUILD_ARTIFACTSTAGINGDIRECTORY/GraphicalTools-$($env:AGENT_OS).zip"
Copy-Item -Path ".\$script:ModuleName.zip" -Destination "$env:BUILD_ARTIFACTSTAGINGDIRECTORY/$script:ModuleName-$($env:AGENT_OS).zip"
}

task . Clean, Build, BuildCmdletHelp, PackageModule, UploadArtifacts
Expand Up @@ -13,6 +13,6 @@
</ItemGroup>

<ItemGroup>
<None Update="GraphicalTools.psd1" CopyToOutputDirectory="PreserveNewest" />
<None Update="Microsoft.PowerShell.GraphicalTools.psd1" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>
</Project>
Expand Up @@ -9,7 +9,7 @@
@{

# Script module or binary module file associated with this manifest.
RootModule = 'GraphicalToolsModule.dll'
RootModule = 'Microsoft.PowerShell.GraphicalTools.dll'

# Version number of this module.
ModuleVersion = '0.1.0'
Expand Down
File renamed without changes.

0 comments on commit a492e90

Please sign in to comment.