File tree Expand file tree Collapse file tree 6 files changed +10
-4
lines changed Expand file tree Collapse file tree 6 files changed +10
-4
lines changed Original file line number Diff line number Diff line change 10
10
" src/Az.Shared.props" ,
11
11
" src/Az.Test.props" ,
12
12
" src/Az.autorest.hybrid.props" ,
13
+ " src/Az.autorest.hybrid.v2.props" ,
14
+ " src/Az.autorest.props" ,
15
+ " src/Az.Post.props" ,
13
16
" src/psm1.props" ,
14
17
" NuGet.Config"
15
18
],
Original file line number Diff line number Diff line change 72
72
<ItemGroup >
73
73
<ModuleCustomFiles Include =" $(MSBuildThisFileDirectory)$(PsRootModuleName)\$(PsModuleFolder)\custom\**\*.*" />
74
74
<ModuleHelpFiles Include =" $(MSBuildThisFileDirectory)$(PsRootModuleName)\$(PsModuleFolder)\help\**\*.*" />
75
+ <ModuleGeneratedFiles Include =" $(MSBuildThisFileDirectory)$(PsRootModuleName)\$(PsModuleFolder)\generated\**\*.*" />
75
76
<ModuleTestFiles Include =" $(MSBuildThisFileDirectory)$(PsRootModuleName)\$(PsModuleFolder)\test\**\*.*" />
76
77
<UtilsFiles Include =" $(MSBuildThisFileDirectory)$(PsRootModuleName)\$(PsModuleFolder)\utils\**\*.*" />
77
78
</ItemGroup >
78
79
79
80
<Target Name =" CopyFiles" AfterTargets =" Build" >
80
81
<Copy SourceFiles =" Az.$(PsModuleName).psm1" DestinationFolder =" $(RepoArtifacts)$(Configuration)\Az.$(PsRootModuleName)\$(PsModuleFolder)" />
82
+ <Copy SourceFiles =" Az.$(PsModuleName).psd1" DestinationFolder =" $(RepoArtifacts)$(Configuration)\Az.$(PsRootModuleName)\$(PsModuleFolder)" Condition =" '$(Configuration)'=='Debug'" />
81
83
<Copy SourceFiles =" Az.$(PsModuleName).format.ps1xml" DestinationFolder =" $(RepoArtifacts)$(Configuration)\Az.$(PsRootModuleName)\$(PsModuleFolder)" />
82
84
<Copy SourceFiles =" check-dependencies.ps1" DestinationFolder =" $(RepoArtifacts)$(Configuration)\Az.$(PsRootModuleName)\$(PsModuleFolder)" Condition =" '$(Configuration)'=='Debug'" />
83
85
<Copy SourceFiles =" test-module.ps1" DestinationFolder =" $(RepoArtifacts)$(Configuration)\Az.$(PsRootModuleName)\$(PsModuleFolder)" Condition =" '$(Configuration)'=='Debug'" />
84
86
<Copy SourceFiles =" @(ModuleCustomFiles)" DestinationFiles =" @(ModuleCustomFiles->'$(RepoArtifacts)$(Configuration)\Az.$(PsRootModuleName)\$(PsModuleFolder)\custom\%(RecursiveDir)%(Filename)%(Extension)')" />
85
87
<Copy SourceFiles =" @(ModuleHelpFiles)" DestinationFiles =" @(ModuleHelpFiles->'$(RepoArtifacts)$(Configuration)\Az.$(PsRootModuleName)\$(PsModuleFolder)\help\%(RecursiveDir)%(Filename)%(Extension)')" />
88
+ <Copy SourceFiles =" @(ModuleGeneratedFiles)" DestinationFiles =" @(ModuleGeneratedFiles->'$(RepoArtifacts)$(Configuration)\Az.$(PsRootModuleName)\$(PsModuleFolder)\generated\%(RecursiveDir)%(Filename)%(Extension)')" Condition =" '$(Configuration)'=='Debug'" />
86
89
<Copy SourceFiles =" @(ModuleTestFiles)" DestinationFiles =" @(ModuleTestFiles->'$(RepoArtifacts)$(Configuration)\Az.$(PsRootModuleName)\$(PsModuleFolder)\test\%(RecursiveDir)%(Filename)%(Extension)')" Condition =" '$(Configuration)'=='Debug'" />
87
90
<Copy SourceFiles =" exports\ProxyCmdletDefinitions.ps1" DestinationFolder =" $(RepoArtifacts)$(Configuration)\Az.$(PsRootModuleName)\$(PsModuleFolder)\exports" />
88
91
<Copy SourceFiles =" internal\ProxyCmdletDefinitions.ps1" DestinationFolder =" $(RepoArtifacts)$(Configuration)\Az.$(PsRootModuleName)\$(PsModuleFolder)\internal" Condition =" Exists('internal\ProxyCmdletDefinitions.ps1')" />
Original file line number Diff line number Diff line change @@ -40,7 +40,7 @@ $DependencyMap = Import-Csv -Path $DependencyMapPath
40
40
41
41
42
42
.($PSScriptRoot + " \PreloadToolDll.ps1" )
43
- $ModuleManifestFiles = $ProjectPaths | ForEach-Object { Get-ChildItem - Path $_ - Filter " *.psd1" - Recurse | Where-Object { $_.FullName -like " *$ ( $BuildConfig ) *" -and `
43
+ $ModuleManifestFiles = $ProjectPaths | ForEach-Object { Get-Item " Az. *.psd1" | Where-Object { $_.FullName -like " *$ ( $BuildConfig ) *" -and `
44
44
$_.FullName -notlike " *Netcore*" -and `
45
45
$_.FullName -notlike " *dll-Help.psd1*" -and `
46
46
(-not [Tools.Common.Utilities.ModuleFilter ]::IsAzureStackModule($_.FullName )) } }
Original file line number Diff line number Diff line change 6
6
)
7
7
8
8
# Get all psd1 files
9
- $psd1Files = Get-Childitem $PSScriptRoot \..\artifacts\$BuildConfig - Recurse | where { $_ .Name -like " *. psd1" }
9
+ $psd1Files = Get-Item $PSScriptRoot \..\artifacts\$BuildConfig \Az. * \Az. * . psd1
10
10
11
11
$profilePsd1 = $psd1Files | Where-Object {$_.Name -like " *Az.Accounts.psd1" }
12
12
Import-LocalizedData - BindingVariable " psd1File" - BaseDirectory $profilePsd1.DirectoryName - FileName $profilePsd1.Name
Original file line number Diff line number Diff line change @@ -24,7 +24,7 @@ $env:PSModulePath += "$pathDelimiter$outputDir/"
24
24
Write-Warning " PSModulePath: $env: PSModulePath "
25
25
26
26
$success = $true
27
- foreach ($psd1FilePath in Get-ChildItem - Path $outputDir - Recurse - Filter * . psd1) {
27
+ foreach ($psd1FilePath in Get-Item " $outputDir /Az.*/Az.*. psd1" ) {
28
28
$manifestError = $null
29
29
Test-ModuleManifest - Path $psd1FilePath.FullName - ErrorVariable manifestError
30
30
if ($manifestError ){
Original file line number Diff line number Diff line change @@ -58,7 +58,7 @@ function New-ModulePsm1 {
58
58
PROCESS {
59
59
$manifestDir = Get-Item - Path $ModulePath
60
60
$moduleName = $manifestDir.Name + " .psd1"
61
- $manifestPath = Get-ChildItem - Path $manifestDir - Filter $moduleName - Recurse
61
+ $manifestPath = ( Get-Item " $manifestDir / $moduleName " ).FullName
62
62
$file = Get-Item $manifestPath
63
63
Import-LocalizedData - BindingVariable ModuleMetadata - BaseDirectory $file.DirectoryName - FileName $file.Name
64
64
You can’t perform that action at this time.
0 commit comments