Skip to content

Merge release -> master for AzureRM.Netcore 0.11.0 #5930

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

Merged
merged 37 commits into from
Apr 12, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
efd64e8
Update netcore versions
markcowl Mar 30, 2018
1f8ed36
Fix issue with RepoTasks in NetCore build
markcowl Mar 31, 2018
a8e191a
Fix release notes issue and publish modules issue
markcowl Mar 31, 2018
d116a54
fix build location for storage module
markcowl Apr 1, 2018
8b4bfaf
Fix netcore signing for storage module
markcowl Apr 1, 2018
84e038e
Update storage module output directory
markcowl Apr 1, 2018
46d5907
Remove preview module from AzureRm.Netcore
markcowl Apr 1, 2018
cd5c1e8
Update NetCore version
markcowl Apr 2, 2018
de3003e
Fix issues with RepoTasks project
markcowl Apr 2, 2018
7bff8d0
Update repotasks tests to avoid nuget issues
markcowl Apr 2, 2018
36626bf
Prepended a space before -and
MiYanni Apr 2, 2018
193a626
Merge pull request #5847 from markcowl/netcore-011
MiYanni Apr 2, 2018
3ce48e7
Corrected types filename casing to not cause loading issues on Linux
MiYanni Apr 2, 2018
4d3f47b
Added script to build Storage psm1
MiYanni Apr 2, 2018
ad7ecc6
Merge branch 'AzureRM.NetCore.0.11.0' of https://github.com/Azure/azu…
MiYanni Apr 2, 2018
cb7627a
Merge branch 'preview' of github.com:/azure/azure-powershell into net…
markcowl Apr 3, 2018
7f67271
Merge branch 'azurerm-psm1-fix' of github.com:cormacpayne/azure-power…
markcowl Apr 3, 2018
b7d3718
Update tools to include storage module build
markcowl Apr 3, 2018
20b73c9
Merge branch 'netcore-011' of github.com:markcowl/azure-powershell in…
markcowl Apr 3, 2018
bd1c6a1
updating module script to build storage
markcowl Apr 3, 2018
6e761f2
Merge branch 'release-2018-04-06' of github.com:/azure/azure-powershe…
markcowl Apr 5, 2018
63b318e
SQL sync of missing cmdlets
MiYanni Apr 6, 2018
795e1f8
Merge pull request #34 from MiYanni/netcore-011a
markcowl Apr 6, 2018
ae0ef2e
Remove rootmodule
markcowl Apr 6, 2018
d995899
Remove preview from Aks
markcowl Apr 6, 2018
bc3f256
Update build and psd1 files for module load issues
markcowl Apr 6, 2018
5eeab93
Merge branch 'netcore-011a' of github.com:markcowl/azure-powershell i…
markcowl Apr 6, 2018
6e2269e
Update references
markcowl Apr 6, 2018
092b15e
Consolidate dependency versions to fix module loading issues
markcowl Apr 6, 2018
891242f
Remove recoveryservices cmdlets and adapt to netstandard and desktop …
markcowl Apr 6, 2018
445ed59
remove preview modules
markcowl Apr 6, 2018
0cfd4f1
Fix storage uploading issues
markcowl Apr 7, 2018
c357fd0
fixing psd1 formatting issue with profile module
markcowl Apr 7, 2018
abfaaf3
Fixing storage management dependency for compute
markcowl Apr 7, 2018
3fe9ec2
Merge pull request #5880 from markcowl/netcore-011a
markcowl Apr 8, 2018
fb152ac
Merge branch 'master' into AzureRM.NetCore.0.11.0
markcowl Apr 11, 2018
e4f5db8
fix docker login change for branch push job
markcowl Apr 12, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ after_success:
docker build . -t $DOCKER_USER/$NAME:$TRAVIS_COMMIT --build-arg CONFIG=$CONFIG;
docker tag $DOCKER_USER/$NAME:$TRAVIS_COMMIT $DOCKER_USER/$NAME:$TRAVIS_BRANCH;

docker login -u $DOCKER_USER -p $DOCKER_PASS;
echo "$DOCKER_PASS" | docker login -u $DOCKER_USER --password-stdin;

docker push $DOCKER_USER/$NAME:$TRAVIS_COMMIT;
docker push $DOCKER_USER/$NAME:$TRAVIS_BRANCH;
Expand Down
142 changes: 1 addition & 141 deletions Azure.PowerShell.Netcore.sln

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions build.proj
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<NetCore Condition=" $(NetCore) == '' " >false</NetCore>
<SkipHelp Condition =" '$(SkipHelp)' == '' ">false</SkipHelp>
<BuildTasksPath>$(LibraryToolsFolder)\BuildPackagesTask\Microsoft.Azure.Build.Tasks\bin\$(Configuration)</BuildTasksPath>
<Stack Condition = "'$(Scope)' == '' or '$(Scope)' == 'all' or '$(Scope)' == 'Stack' ">true</Stack>
<Stack Condition = "(('$(Scope)' == '' or '$(Scope)' == 'all') and '$(NetCore)' == 'false') or '$(Scope)' == 'Stack' ">true</Stack>
<Latest Condition = "'$(Scope)' == '' or '$(Scope)' != 'Stack'">true</Latest>
</PropertyGroup>
<ItemGroup>
Expand All @@ -71,7 +71,7 @@

<StaticAnalysis Include=".\tools\StaticAnalysis\StaticAnalysis.sln" />
<LocalBuildTasks Include="$(LibraryToolsFolder)\BuildPackagesTask\Microsoft.Azure.Build.Tasks.sln" />
<LocalBuildTasks Include="$(LibraryToolsFolder)\RepoTasks\RepoTasks.sln" />
<LocalBuildTasks Include="$(LibraryToolsFolder)\RepoTasks\RepoTasks.sln" Condition="'$(NetCore)' == 'false'"/>
</ItemGroup>

<!-- Tasks -->
Expand Down Expand Up @@ -417,7 +417,7 @@
Condition="!$(DelaySign) and '@(ScriptsToSign)' != ''"/>

<Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\CheckSignature.ps1 -CustomPath $(LibrarySourceFolder)\Package\$(Configuration) &quot;"
ContinueOnError="ErrorAndContinue" />
ContinueOnError="ErrorAndContinue" Condition="'$(NetCore)' == 'false'"/>

<!-- Copying signed shortcut back -->
<Copy SourceFiles="$(LibrarySourceFolder)\Package\$(Configuration)\AzureRM.Netcore.psd1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure" Version="3.3.8" />
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure" Version="3.3.12" />
<PackageReference Include="System.Collections.Specialized" Version="4.3.0" />
<PackageReference Include="System.Reflection" Version="4.3.0" />
<PackageReference Include="System.Security.SecureString" Version="4.3.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@

<ItemGroup>
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication" Version="2.2.12" />
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="6.5.0-preview" />
<PackageReference Include="WindowsAzure.Storage" Version="8.1.1" />
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="7.1.0-preview" />
<PackageReference Include="WindowsAzure.Storage" Version="9.0.0" />
<PackageReference Include="System.Collections.NonGeneric" Version="4.3.0" />
</ItemGroup>

Expand Down
2 changes: 0 additions & 2 deletions src/Common/Commands.Common/Utilities/Validate.cs
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,6 @@ public static void ValidateInternetConnection()
{
throw new Exception(Resources.NoInternetConnection);
}
#else
throw new NotSupportedException();
#endif
}

Expand Down
6 changes: 3 additions & 3 deletions src/ResourceManager/Aks/AzureRM.Aks.Netcore.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# RootModule = ''

# Version number of this module.
ModuleVersion = '0.10.0'
ModuleVersion = '0.11.0'

# Supported PSEditions
CompatiblePSEditions = 'Core'
Expand Down Expand Up @@ -51,7 +51,7 @@ PowerShellVersion = '5.1'
# ProcessorArchitecture = ''

# Modules that must be imported into the global environment prior to importing this module
RequiredModules = @(@{ModuleName = 'AzureRM.Profile.Netcore'; ModuleVersion = '0.10.0'; })
RequiredModules = @(@{ModuleName = 'AzureRM.Profile.Netcore'; ModuleVersion = '0.11.0'; })

# Assemblies that must be loaded prior to importing this module
RequiredAssemblies = '.\YamlDotNet.dll',
Expand Down Expand Up @@ -113,7 +113,7 @@ PrivateData = @{

# External dependent modules of this module
# ExternalModuleDependencies = ''
Prerelease = 'preview'
# Prerelease = ''

} # End of PSData hashtable

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# RootModule = ''

# Version number of this module.
ModuleVersion = '0.10.0'
ModuleVersion = '0.11.0'

# Supported PSEditions
CompatiblePSEditions = 'Core'
Expand Down Expand Up @@ -51,7 +51,7 @@ PowerShellVersion = '5.1'
# ProcessorArchitecture = ''

# Modules that must be imported into the global environment prior to importing this module
RequiredModules = @(@{ModuleName = 'AzureRM.Profile.Netcore'; ModuleVersion = '0.10.0'; })
RequiredModules = @(@{ModuleName = 'AzureRM.Profile.Netcore'; ModuleVersion = '0.11.0'; })

# Assemblies that must be loaded prior to importing this module
RequiredAssemblies = '.\Microsoft.Azure.Management.Analysis.dll'
Expand Down Expand Up @@ -116,7 +116,7 @@ PrivateData = @{
# IconUri = ''

# ReleaseNotes of this module
ReleaseNotes = ''
ReleaseNotes = 'Initial Release'

# Prerelease string of this module
# Prerelease = ''
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# RootModule = ''

# Version number of this module.
ModuleVersion = '0.10.0'
ModuleVersion = '0.11.0'

# Supported PSEditions
CompatiblePSEditions = 'Core'
Expand Down Expand Up @@ -51,7 +51,7 @@ PowerShellVersion = '5.1'
# ProcessorArchitecture = ''

# Modules that must be imported into the global environment prior to importing this module
RequiredModules = @(@{ModuleName = 'AzureRM.Profile.Netcore'; ModuleVersion = '0.10.0'; })
RequiredModules = @(@{ModuleName = 'AzureRM.Profile.Netcore'; ModuleVersion = '0.11.0'; })

# Assemblies that must be loaded prior to importing this module
RequiredAssemblies = @()
Expand Down Expand Up @@ -110,7 +110,7 @@ PrivateData = @{
# IconUri = ''

# ReleaseNotes of this module
ReleaseNotes = ''
ReleaseNotes = 'Initial Release'

# Prerelease string of this module
# Prerelease = ''
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.10" />
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure" Version="3.3.10" />
<PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.11" />
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure" Version="3.3.12" />
<PackageReference Include="Microsoft.WindowsAzure.Management" Version="4.1.1" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# RootModule = ''

# Version number of this module.
ModuleVersion = '0.10.0'
ModuleVersion = '0.11.0'

# Supported PSEditions
CompatiblePSEditions = 'Core'
Expand Down Expand Up @@ -51,7 +51,7 @@ PowerShellVersion = '5.1'
# ProcessorArchitecture = ''

# Modules that must be imported into the global environment prior to importing this module
RequiredModules = @(@{ModuleName = 'AzureRM.Profile.Netcore'; ModuleVersion = '0.10.0'; })
RequiredModules = @(@{ModuleName = 'AzureRM.Profile.Netcore'; ModuleVersion = '0.11.0'; })

# Assemblies that must be loaded prior to importing this module
RequiredAssemblies = '.\AutoMapper.dll', '.\Microsoft.Azure.Management.ApiManagement.dll'
Expand Down Expand Up @@ -182,7 +182,7 @@ PrivateData = @{
# IconUri = ''

# ReleaseNotes of this module
ReleaseNotes = ''
ReleaseNotes = 'Initial Release'

# Prerelease string of this module
# Prerelease = ''
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AutoMapper" Version="6.0.2" />
<PackageReference Include="AutoMapper" Version="6.2.2" />
<PackageReference Include="Microsoft.Azure.Management.ApiManagement" Version="3.4.0-preview" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AutoMapper" Version="6.0.2" />
<PackageReference Include="AutoMapper" Version="6.2.2" />
<PackageReference Include="Microsoft.Azure.Management.ApiManagement" Version="3.4.0-preview" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# RootModule = ''

# Version number of this module.
ModuleVersion = '0.10.0'
ModuleVersion = '0.11.0'

# Supported PSEditions
CompatiblePSEditions = 'Core'
Expand Down Expand Up @@ -51,7 +51,7 @@ PowerShellVersion = '5.1'
# ProcessorArchitecture = ''

# Modules that must be imported into the global environment prior to importing this module
RequiredModules = @(@{ModuleName = 'AzureRM.Profile.Netcore'; ModuleVersion = '0.10.0'; })
RequiredModules = @(@{ModuleName = 'AzureRM.Profile.Netcore'; ModuleVersion = '0.11.0'; })

# Assemblies that must be loaded prior to importing this module
RequiredAssemblies = '.\Microsoft.Azure.Management.ApplicationInsights.dll'
Expand Down Expand Up @@ -117,7 +117,7 @@ PrivateData = @{
# IconUri = ''

# ReleaseNotes of this module
ReleaseNotes = ''
ReleaseNotes = 'Initial Release'

# Prerelease string of this module
# Prerelease = ''
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# RootModule = ''

# Version number of this module.
ModuleVersion = '0.10.0'
ModuleVersion = '0.11.0'

# Supported PSEditions
CompatiblePSEditions = 'Core'
Expand Down Expand Up @@ -51,7 +51,7 @@ PowerShellVersion = '5.1'
# ProcessorArchitecture = ''

# Modules that must be imported into the global environment prior to importing this module
RequiredModules = @(@{ModuleName = 'AzureRM.Profile.Netcore'; ModuleVersion = '0.10.0'; })
RequiredModules = @(@{ModuleName = 'AzureRM.Profile.Netcore'; ModuleVersion = '0.11.0'; })

# Assemblies that must be loaded prior to importing this module
RequiredAssemblies = '.\Microsoft.Azure.Management.Automation.dll'
Expand Down Expand Up @@ -162,7 +162,7 @@ PrivateData = @{
# IconUri = ''

# ReleaseNotes of this module
ReleaseNotes = ''
ReleaseNotes = 'Initial Release'

# Prerelease string of this module
# Prerelease = ''
Expand Down
6 changes: 3 additions & 3 deletions src/ResourceManager/AzureBackup/AzureRM.Backup.Netcore.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# RootModule = ''

# Version number of this module.
ModuleVersion = '0.10.0'
ModuleVersion = '0.11.0'

# Supported PSEditions
CompatiblePSEditions = 'Core'
Expand Down Expand Up @@ -51,7 +51,7 @@ PowerShellVersion = '5.1'
# ProcessorArchitecture = ''

# Modules that must be imported into the global environment prior to importing this module
RequiredModules = @(@{ModuleName = 'AzureRM.Profile.Netcore'; ModuleVersion = '0.10.0'; })
RequiredModules = @(@{ModuleName = 'AzureRM.Profile.Netcore'; ModuleVersion = '0.11.0'; })

# Assemblies that must be loaded prior to importing this module
RequiredAssemblies = '.\Microsoft.Azure.Management.BackupServicesManagement.dll',
Expand Down Expand Up @@ -124,7 +124,7 @@ PrivateData = @{
# IconUri = ''

# ReleaseNotes of this module
ReleaseNotes = ''
ReleaseNotes = 'Initial Release'

# Prerelease string of this module
# Prerelease = ''
Expand Down
6 changes: 3 additions & 3 deletions src/ResourceManager/AzureBatch/AzureRM.Batch.Netcore.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# RootModule = ''

# Version number of this module.
ModuleVersion = '0.10.0'
ModuleVersion = '0.11.0'

# Supported PSEditions
CompatiblePSEditions = 'Core'
Expand Down Expand Up @@ -51,7 +51,7 @@ PowerShellVersion = '5.1'
# ProcessorArchitecture = ''

# Modules that must be imported into the global environment prior to importing this module
RequiredModules = @(@{ModuleName = 'AzureRM.Profile.Netcore'; ModuleVersion = '0.10.0'; })
RequiredModules = @(@{ModuleName = 'AzureRM.Profile.Netcore'; ModuleVersion = '0.11.0'; })

# Assemblies that must be loaded prior to importing this module
RequiredAssemblies = '.\Microsoft.Azure.Batch.dll',
Expand Down Expand Up @@ -143,7 +143,7 @@ PrivateData = @{
# IconUri = ''

# ReleaseNotes of this module
ReleaseNotes = ''
ReleaseNotes = 'Initial Release'

# Prerelease string of this module
# Prerelease = ''
Expand Down
6 changes: 3 additions & 3 deletions src/ResourceManager/Billing/AzureRM.Billing.Netcore.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# RootModule = ''

# Version number of this module.
ModuleVersion = '0.10.0'
ModuleVersion = '0.11.0'

# Supported PSEditions
CompatiblePSEditions = 'Core'
Expand Down Expand Up @@ -51,7 +51,7 @@ PowerShellVersion = '5.1'
# ProcessorArchitecture = ''

# Modules that must be imported into the global environment prior to importing this module
RequiredModules = @(@{ModuleName = 'AzureRM.Profile.Netcore'; ModuleVersion = '0.10.0'; })
RequiredModules = @(@{ModuleName = 'AzureRM.Profile.Netcore'; ModuleVersion = '0.11.0'; })

# Assemblies that must be loaded prior to importing this module
RequiredAssemblies = '.\Microsoft.Azure.Management.Billing.dll'
Expand Down Expand Up @@ -107,7 +107,7 @@ PrivateData = @{
# IconUri = ''

# ReleaseNotes of this module
ReleaseNotes = ''
ReleaseNotes = 'Initial Release'

# Prerelease string of this module
# Prerelease = ''
Expand Down
6 changes: 3 additions & 3 deletions src/ResourceManager/Cdn/AzureRM.Cdn.Netcore.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# RootModule = ''

# Version number of this module.
ModuleVersion = '0.10.0'
ModuleVersion = '0.11.0'

# Supported PSEditions
CompatiblePSEditions = 'Core'
Expand Down Expand Up @@ -51,7 +51,7 @@ PowerShellVersion = '5.1'
# ProcessorArchitecture = ''

# Modules that must be imported into the global environment prior to importing this module
RequiredModules = @(@{ModuleName = 'AzureRM.Profile.Netcore'; ModuleVersion = '0.10.0'; })
RequiredModules = @(@{ModuleName = 'AzureRM.Profile.Netcore'; ModuleVersion = '0.11.0'; })

# Assemblies that must be loaded prior to importing this module
RequiredAssemblies = '.\Microsoft.Azure.Management.Cdn.dll'
Expand Down Expand Up @@ -119,7 +119,7 @@ PrivateData = @{
# IconUri = ''

# ReleaseNotes of this module
ReleaseNotes = ''
ReleaseNotes = 'Initial Release'

# Prerelease string of this module
# Prerelease = ''
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# RootModule = ''

# Version number of this module.
ModuleVersion = '0.10.0'
ModuleVersion = '0.11.0'

# Supported PSEditions
CompatiblePSEditions = 'Core'
Expand Down Expand Up @@ -51,7 +51,7 @@ PowerShellVersion = '5.1'
# ProcessorArchitecture = ''

# Modules that must be imported into the global environment prior to importing this module
RequiredModules = @(@{ModuleName = 'AzureRM.Profile.Netcore'; ModuleVersion = '0.10.0'; })
RequiredModules = @(@{ModuleName = 'AzureRM.Profile.Netcore'; ModuleVersion = '0.11.0'; })

# Assemblies that must be loaded prior to importing this module
RequiredAssemblies = '.\Microsoft.Azure.Management.CognitiveServices.dll'
Expand Down Expand Up @@ -114,7 +114,7 @@ PrivateData = @{
# IconUri = ''

# ReleaseNotes of this module
ReleaseNotes = ''
ReleaseNotes = 'Initial Release'

# Prerelease string of this module
# Prerelease = ''
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

<ItemGroup >
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication" Version="2.2.12" />
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure" Version="3.3.8" />
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure" Version="3.3.12" />
<PackageReference Include="System.Collections.NonGeneric" Version="4.3.0" />
</ItemGroup>

Expand Down
Loading