Skip to content

Commit eb2afb5

Browse files
authored
Not include *.autorest/*.psd1 (#21278)
* Not include *.autorest/*.psd1 * Not include *.autorest/*.psd1 * Not include *.autorest/*.psd1 * Not include *.autorest/*.psd1 * Not include *.autorest/*.psd1
1 parent d7155ed commit eb2afb5

File tree

6 files changed

+10
-4
lines changed

6 files changed

+10
-4
lines changed

.azure-pipelines/SyncFromMainBranchConfig.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
"src/Az.Shared.props",
1111
"src/Az.Test.props",
1212
"src/Az.autorest.hybrid.props",
13+
"src/Az.autorest.hybrid.v2.props",
14+
"src/Az.autorest.props",
15+
"src/Az.Post.props",
1316
"src/psm1.props",
1417
"NuGet.Config"
1518
],

src/Az.autorest.hybrid.props

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,17 +72,20 @@
7272
<ItemGroup>
7373
<ModuleCustomFiles Include="$(MSBuildThisFileDirectory)$(PsRootModuleName)\$(PsModuleFolder)\custom\**\*.*"/>
7474
<ModuleHelpFiles Include="$(MSBuildThisFileDirectory)$(PsRootModuleName)\$(PsModuleFolder)\help\**\*.*"/>
75+
<ModuleGeneratedFiles Include="$(MSBuildThisFileDirectory)$(PsRootModuleName)\$(PsModuleFolder)\generated\**\*.*"/>
7576
<ModuleTestFiles Include="$(MSBuildThisFileDirectory)$(PsRootModuleName)\$(PsModuleFolder)\test\**\*.*"/>
7677
<UtilsFiles Include="$(MSBuildThisFileDirectory)$(PsRootModuleName)\$(PsModuleFolder)\utils\**\*.*"/>
7778
</ItemGroup>
7879

7980
<Target Name="CopyFiles" AfterTargets="Build">
8081
<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'"/>
8183
<Copy SourceFiles="Az.$(PsModuleName).format.ps1xml" DestinationFolder="$(RepoArtifacts)$(Configuration)\Az.$(PsRootModuleName)\$(PsModuleFolder)" />
8284
<Copy SourceFiles="check-dependencies.ps1" DestinationFolder="$(RepoArtifacts)$(Configuration)\Az.$(PsRootModuleName)\$(PsModuleFolder)" Condition="'$(Configuration)'=='Debug'"/>
8385
<Copy SourceFiles="test-module.ps1" DestinationFolder="$(RepoArtifacts)$(Configuration)\Az.$(PsRootModuleName)\$(PsModuleFolder)" Condition="'$(Configuration)'=='Debug'"/>
8486
<Copy SourceFiles="@(ModuleCustomFiles)" DestinationFiles="@(ModuleCustomFiles->'$(RepoArtifacts)$(Configuration)\Az.$(PsRootModuleName)\$(PsModuleFolder)\custom\%(RecursiveDir)%(Filename)%(Extension)')" />
8587
<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'"/>
8689
<Copy SourceFiles="@(ModuleTestFiles)" DestinationFiles="@(ModuleTestFiles->'$(RepoArtifacts)$(Configuration)\Az.$(PsRootModuleName)\$(PsModuleFolder)\test\%(RecursiveDir)%(Filename)%(Extension)')" Condition="'$(Configuration)'=='Debug'"/>
8790
<Copy SourceFiles="exports\ProxyCmdletDefinitions.ps1" DestinationFolder="$(RepoArtifacts)$(Configuration)\Az.$(PsRootModuleName)\$(PsModuleFolder)\exports" />
8891
<Copy SourceFiles="internal\ProxyCmdletDefinitions.ps1" DestinationFolder="$(RepoArtifacts)$(Configuration)\Az.$(PsRootModuleName)\$(PsModuleFolder)\internal" Condition="Exists('internal\ProxyCmdletDefinitions.ps1')" />

tools/CheckAssemblies.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ $DependencyMap = Import-Csv -Path $DependencyMapPath
4040

4141

4242
.($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 `
4444
$_.FullName -notlike "*Netcore*" -and `
4545
$_.FullName -notlike "*dll-Help.psd1*" -and `
4646
(-not [Tools.Common.Utilities.ModuleFilter]::IsAzureStackModule($_.FullName)) } }

tools/NewOutputTypeIndex.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ param(
66
)
77

88
# 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
1010

1111
$profilePsd1 = $psd1Files | Where-Object {$_.Name -like "*Az.Accounts.psd1"}
1212
Import-LocalizedData -BindingVariable "psd1File" -BaseDirectory $profilePsd1.DirectoryName -FileName $profilePsd1.Name

tools/TestModuleLoading.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ $env:PSModulePath += "$pathDelimiter$outputDir/"
2424
Write-Warning "PSModulePath: $env:PSModulePath"
2525

2626
$success = $true
27-
foreach($psd1FilePath in Get-ChildItem -Path $outputDir -Recurse -Filter *.psd1) {
27+
foreach($psd1FilePath in Get-Item "$outputDir/Az.*/Az.*.psd1") {
2828
$manifestError = $null
2929
Test-ModuleManifest -Path $psd1FilePath.FullName -ErrorVariable manifestError
3030
if($manifestError){

tools/UpdateModules.psm1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ function New-ModulePsm1 {
5858
PROCESS {
5959
$manifestDir = Get-Item -Path $ModulePath
6060
$moduleName = $manifestDir.Name + ".psd1"
61-
$manifestPath = Get-ChildItem -Path $manifestDir -Filter $moduleName -Recurse
61+
$manifestPath = (Get-Item "$manifestDir/$moduleName").FullName
6262
$file = Get-Item $manifestPath
6363
Import-LocalizedData -BindingVariable ModuleMetadata -BaseDirectory $file.DirectoryName -FileName $file.Name
6464

0 commit comments

Comments
 (0)