-
Notifications
You must be signed in to change notification settings - Fork 4.1k
Update module definitions for common runtime #4734
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update module definitions for common runtime #4734
Conversation
|
Packing job: http://azuresdkci.cloudapp.net/job/posh-pack/26/ |
|
@azuresdkci test this please |
d1e7dc2 to
639874a
Compare
| <Component Id="cmp18A4F358ED4D601BEBD0BB389140FE09" Guid="*"> | ||
| <File Id="filDAD2F2CFF2BAC7646E21E7FE8545C982" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataFactories\Microsoft.Azure.Management.DataFactories.dll" /> | ||
| </Component> | ||
| <Component Id="cmp43018C27AAE99DE2AACE593F0DA2D07A" Guid="*"> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why were these removed? The Microsoft.Data.* dlls are generally a dependencyof the WindowsAzure.Storage library, so references to them shoudl be independent, as it is for WIndosAzure.Storage
|
|
||
| # External dependent modules of this module | ||
| # ExternalModuleDependencies = '' | ||
| # ExternalModuleDependencies = 'AzureRM.Profile' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should remove these, this should be added and removed by tools
tools/CleanupBuild.ps1
Outdated
| $resourcesFolders = @("de", "es", "fr", "it", "ja", "ko", "ru", "zh-Hans", "zh-Hant") | ||
| Get-ChildItem -Include $resourcesFolders -Recurse -Force -Path $output | Remove-Item -Force -Recurse -ErrorAction SilentlyContinue | ||
|
|
||
| Write-Verbose "Removing XML help files for helper dlls from $output" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Remove autogeenrated Xml help files, conde analysis, config files, and symbols
tools/CleanupBuild.ps1
Outdated
| Cleanup-MarkdownHelp -BuildConfig $BuildConfig | ||
| $acceptedDlls = $acceptedDlls | where { $_ -ne $null } | % { $_.Substring(2) } | ||
|
|
||
| Get-ChildItem -Path $RMFolder.FullName -Filter "*.dll" | where { $acceptedDlls -notcontains $_.Name} | Remove-Item -Force |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It might be worthwhile to ensure we print out these files we are removing so we can debug any issues
tools/PublishModules.ps1
Outdated
| } | ||
| else | ||
| { | ||
| $newModules += (@{ModuleName = $module["ModuleName"]; ModuleVersion= $module["ModuleVersion"]}) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ensure that we have tested this
| $nupkgPath = Join-Path -Path $TempRepoPath -ChildPath ($moduleName + "." + $manifest.Version.ToString() + ".nupkg") | ||
| $file = Get-Item $moduleSourcePath | ||
| Import-LocalizedData -BindingVariable ModuleMetadata -BaseDirectory $file.DirectoryName -FileName $file.Name | ||
| $nupkgPath = Join-Path -Path $TempRepoPath -ChildPath ($moduleName + "." + $ModuleMetadata.ModuleVersion.ToString() + ".nupkg") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Before we call PublishModule, we should add in 'ExternalModuleDependencies', and we should remove it before the final nuget package refactoring, liek here: https://github.com/markcowl/azure-powershell/blob/fixazs/tools/PublishModules.ps1#L283
…ne/azure-powershell into module-definition-psm1-spoof # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.
…ne/azure-powershell into module-definition-psm1-spoof # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.
…ormacpayne/azure-powershell into module-definition-psm1-spoof" This reverts commit 4e6a420, reversing changes made to dd8ac94.
…nto module-definition-psm1 # Conflicts: # src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachine/VirtualMachineRunCommandMethod.cs
|
UPDATED Packaging job: http://azuresdkci.cloudapp.net/job/posh-pack/94/ |
…nto module-definition-psm1 # Conflicts: # setup/azurecmdfiles.wxi
tools/UpdateModules.ps1
Outdated
| return "`$module = Get-Module $ModuleName ` | ||
| if (`$module -ne `$null -and `$module.Version.ToString().CompareTo(`"$MinimumVersion`") -lt 0) ` | ||
| { ` | ||
| Write-Warning `"A later version of $ModuleName was found to be imported already. Please see <link> for more details.`" ` |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please change these strings:
This module requires $ModuleName version $ModuleVersion. An earlier version of $ModuleName is imported in the current PowerShell session. Please open a new session before importing this module. This error could indicate that multiple incompatible versions of the Azure PowerShell cmdlets are installed on your system. Please see https://aka.ms/azps-version-error for troubleshooting information.
…owershell into module-definition-psm1 # Conflicts: # src/ResourceManager/ContainerInstance/AzureRM.ContainerInstance.psd1 # tools/AzureRM.Example.psm1
…hell into module-definition-psm1
|
Closing in favor of #4921 |
Description
Fix for issue #3972
This checklist is used to make sure that common guidelines for a pull request are followed. You can find a more complete discussion of PowerShell cmdlet best practices here.
General Guidelines
Testing Guidelines
Cmdlet Signature Guidelines
ShouldProcessand haveSupportShouldProcess=truespecified in the cmdlet attribute. You can find more information onShouldProcesshere.OutputTypeattribute if any output is produced - if the cmdlet produces no output, it should implement aPassThruparameter.Cmdlet Parameter Guidelines