Skip to content

Commit fddf34d

Browse files
cormacpaynecormacpayne
committed
Merge branch 'preview' of github.com:Azure/azure-powershell into adls-data-plane
# Conflicts: # src/ResourceManager/DataLakeStore/Commands.DataLakeStore/DataPlaneCommands/AddAzureRmDataLakeStoreItemContent.cs # src/ResourceManager/DataLakeStore/Commands.DataLakeStore/DataPlaneCommands/NewAzureRmDataLakeStoreItem.cs
2 parents 4884c7a + 72b3ca0 commit fddf34d

File tree

667 files changed

+326713
-39318
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

667 files changed

+326713
-39318
lines changed

‎.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,8 @@ FakesAssemblies/
215215
*.GhostDoc.xml
216216
pingme.txt
217217
groupMapping*.json
218+
/tools/index.json
219+
/Package/index.json
218220

219221
*.msi
220222
*.wixpdb
@@ -228,3 +230,6 @@ Package
228230
.idea
229231
/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Logger/bin
230232
/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/bin
233+
/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/bin
234+
/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/bin
235+
/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.ServiceClientAdapter/bin

‎Azure.PowerShell.Netcore.sln

Lines changed: 365 additions & 1 deletion
Large diffs are not rendered by default.

‎TestMappings.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,11 @@
5959
],
6060
"src/ResourceManager/DataFactories/": [
6161
".\\src\\ResourceManager\\DataFactories\\Commands.DataFactories.Test\\bin\\Debug\\Microsoft.Azure.Commands.DataFactories.Test.dll",
62-
".\\src\\ResourceManager\\DataFactories\\Commands.DataFactoryV2.Test\\bin\\Debug\\Microsoft.Azure.Commands.DataFactoryV2.Test.dll",
6362
".\\src\\ResourceManager\\StreamAnalytics\\Commands.StreamAnalytics.Test\\bin\\Debug\\Microsoft.Azure.Commands.StreamAnalytics.Test.dll"
6463
],
64+
"src/ResourceManager/DataFactoryV2/": [
65+
".\\src\\ResourceManager\\DataFactoryV2\\Commands.DataFactoryV2.Test\\bin\\Debug\\Microsoft.Azure.Commands.DataFactoryV2.Test.dll"
66+
],
6567
"src/ResourceManager/DataLakeAnalytics/": [
6668
".\\src\\ResourceManager\\DataLakeAnalytics\\Commands.DataLakeAnalytics.Test\\bin\\Debug\\Microsoft.Azure.Commands.DataLakeAnalytics.Test.dll"
6769
],
@@ -203,5 +205,8 @@
203205
],
204206
"tools/BuildPackagesTask/": [
205207
".\\tools\\BuildPackagesTask\\Microsoft.Azure.Build.Tasks.Test\\bin\\Debug\\Microsoft.Azure.Build.Tasks.Test.dll"
208+
],
209+
"tools/RepoTasks/": [
210+
".\\tools\\RepoTasks\\RepoTasks.Cmdlets.Tests\\bin\\Debug\\RepoTasks.Cmdlets.Tests.dll"
206211
]
207212
}

‎build.proj

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@
7171

7272
<StaticAnalysis Include=".\tools\StaticAnalysis\StaticAnalysis.sln" />
7373
<LocalBuildTasks Include="$(LibraryToolsFolder)\BuildPackagesTask\Microsoft.Azure.Build.Tasks.sln" />
74+
<LocalBuildTasks Include="$(LibraryToolsFolder)\RepoTasks\RepoTasks.sln" />
7475
</ItemGroup>
7576

7677
<!-- Tasks -->
@@ -148,6 +149,7 @@
148149
<NuGetRestoreConfigSwitch>-ConfigFile &quot;$(NuGetRestoreConfigFile)&quot;</NuGetRestoreConfigSwitch>
149150
<NuGetRestorePackageSetting>-PackagesDirectory $(LibraryNugetPackageFolder)</NuGetRestorePackageSetting>
150151
<NuGetLocalBuildTaskPackages>-PackagesDirectory $(LibraryToolsFolder)\BuildPackagesTask\packages</NuGetLocalBuildTaskPackages>
152+
<NuGetRepoTasksPackages>-PackagesDirectory $(LibraryToolsFolder)\RepoTasks\packages</NuGetRepoTasksPackages>
151153

152154
<PowerShellCommand Condition=" '$(PowerShellCommand)' == '' ">C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe</PowerShellCommand>
153155
<PowerShellCoreCommand Condition=" '$(PowerShellCoreCommand)' == '' ">pwsh</PowerShellCoreCommand>
@@ -182,6 +184,11 @@
182184
<!-- Restore packages for local build tasks-->
183185
<Exec Command="$(NuGetCommand) restore %(LocalBuildTasks.FullPath) $(NuGetRestoreConfigSwitch) $(NuGetLocalBuildTaskPackages)"
184186
ContinueOnError="false" />
187+
<!-- Restore packages for repo tasks tasks-->
188+
<Exec Command="$(NuGetCommand) restore %(LocalBuildTasks.FullPath) $(NuGetRestoreConfigSwitch) $(NuGetRepoTasksPackages)"
189+
ContinueOnError="false" />
190+
<Exec Command="$(NuGetCommand) restore %(SetupSln.FullPath) $(NuGetRestoreConfigSwitch) $(NuGetRestorePackageSetting)"
191+
ContinueOnError="false" />
185192

186193
<!--Restore the xunit runner needed to run unit tests-->
187194
<Exec Command="$(NuGetCommand) restore $(MSBuildProjectDirectory)\packages.config -PackagesDirectory $(MSBuildProjectDirectory)\packages" />
@@ -194,8 +201,6 @@
194201
<Message Importance="high" Text="Building Cmdlets..." />
195202

196203
<MakeDir Directories="$(PackageDirectory)" />
197-
<Exec ContinueOnError="false"
198-
Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot; . $(LibraryToolsFolder)\CreateMappings.ps1 -RootPath $(LibrarySourceFolder) -OutputFile $(PackageDirectory)\groupMapping.json -WarningFile $(PackageDirectory)\groupMappingWarnings.json -RulesFile $(LibraryToolsFolder)\CreateMappings_rules.json &quot;" Condition="'$(Latest)' == 'true'"/>
199204

200205
<MSBuild
201206
Projects="@(CmdletSolutionsToBuild)"
@@ -211,6 +216,10 @@
211216

212217
<Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\UpdateModules.ps1 $(Configuration) $(Scope) -Profile Latest &quot; " Condition="'$(Latest)' == 'true' and '$(CodeSign)' == 'false'"/>
213218
<Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\UpdateModules.ps1 $(Configuration) $(Scope) -Profile Stack &quot; " Condition="'$(Stack)' == 'true' and '$(CodeSign)' == 'false'"/>
219+
220+
<Exec ContinueOnError="false"
221+
Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot; . $(LibraryToolsFolder)\NewHelpIndex.ps1 -OutputFile $(PackageDirectory)\index.json -BuildConfig $(Configuration) &quot;" Condition="'$(Latest)' == 'true'"/>
222+
214223
<!-- Copying shortcut to be signed -->
215224
<Copy SourceFiles="$(LibraryRoot)tools\AzureRM\AzureRM.psd1"
216225
DestinationFolder="$(LibrarySourceFolder)\Package\$(Configuration)" Condition= " '$(NetCore)' == 'false' and '$(Latest)' == 'true'"/>
@@ -245,6 +254,7 @@
245254

246255
<Message Importance="high" Text="Running Static Analyser" />
247256
<CallTarget targets="DependencyAnalysis" ContinueOnError="ErrorAndContinue" />
257+
<Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\CheckAssemblies.ps1 &quot;" />
248258
<Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\CleanupBuild.ps1 -BuildConfig $(Configuration) &quot;" />
249259
</Target>
250260

‎src/Common/Commands.Common/Attributes/Ps1XmlAttribute.cs

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
// Copyright Microsoft Corporation
2+
// Licensed under the Apache License, Version 2.0 (the "License");
3+
// you may not use this file except in compliance with the License.
4+
// You may obtain a copy of the License at
5+
// http://www.apache.org/licenses/LICENSE-2.0
6+
// Unless required by applicable law or agreed to in writing, software
7+
// distributed under the License is distributed on an "AS IS" BASIS,
8+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
9+
// See the License for the specific language governing permissions and
10+
// limitations under the License.
11+
// ----------------------------------------------------------------------------------
12+
13+
using System;
14+
15+
namespace Microsoft.WindowsAzure.Commands.Common.Attributes
16+
{
17+
[Flags]
18+
public enum ViewControl
19+
{
20+
None = 0,
21+
Table,
22+
List,
23+
All = Table | List,
24+
}
25+
26+
[AttributeUsage(AttributeTargets.Property | AttributeTargets.Field)]
27+
public sealed class Ps1XmlAttribute : Attribute
28+
{
29+
public string Label { get; set; }
30+
31+
public ViewControl Target { get; set; } = ViewControl.Table;
32+
}
33+
}

‎src/Common/Commands.Common/AzureDataCmdlet.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,21 +78,24 @@ protected override void ConfirmAction(bool force, string continueMessage, string
7878
ConfirmAction(force, continueMessage, processMessage, target, action, () => true);
7979
}
8080

81-
#if !NETSTANDARD
8281
public IAzureContextContainer SMProfile
8382
{
8483
get
8584
{
85+
#if NETSTANDARD
86+
return null;
87+
#else
8688
IAzureContextContainer result = null;
8789
if (AzureSMProfileProvider.Instance != null)
8890
{
8991
result = AzureSMProfileProvider.Instance.Profile;
9092
}
9193

9294
return result;
95+
#endif
9396
}
9497
}
95-
#endif
98+
9699

97100
protected override string DataCollectionWarning
98101
{

‎src/Common/Commands.Common/Commands.Common.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@
111111
<Reference Include="System.Xml" />
112112
</ItemGroup>
113113
<ItemGroup>
114+
<Compile Include="Attributes\Ps1XmlAttribute.cs" />
114115
<Compile Include="LongRunningJobCancelledException.cs" />
115116
<Compile Include="ShouldMethodInvoker.cs" />
116117
<Compile Include="AzureLongRunningJob.cs" />

‎src/ResourceManager/Aks/AzureRM.Aks.psd1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ CLRVersion = '4.0'
5454
RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.1.1'; })
5555

5656
# Assemblies that must be loaded prior to importing this module
57-
RequiredAssemblies = '.\YamlDotNet.dll',
58-
'.\Microsoft.Azure.Commands.Common.Graph.RBAC.dll',
59-
'.\AutoMapper.dll'
57+
RequiredAssemblies = '.\YamlDotNet.dll',
58+
'.\Microsoft.Azure.Commands.Common.Graph.RBAC.dll',
59+
'.\AutoMapper.dll', '.\System.Management.Automation.dll'
6060

6161
# Script files (.ps1) that are run in the caller's environment prior to importing this module.
6262
# ScriptsToProcess = @()

‎src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/Azure.AnalysisServices.Netcore.psd1

Lines changed: 135 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,135 @@
1+
#
2+
# Module manifest for module 'Azure.AnalysisServices.Netcore'
3+
#
4+
# Generated by: Microsoft Corporation
5+
#
6+
# Generated on: 3/15/2018
7+
#
8+
9+
@{
10+
11+
# Script module or binary module file associated with this manifest.
12+
# RootModule = ''
13+
14+
# Version number of this module.
15+
ModuleVersion = '0.10.0'
16+
17+
# Supported PSEditions
18+
CompatiblePSEditions = 'Core'
19+
20+
# ID used to uniquely identify this module
21+
GUID = 'c717b5a4-1f1b-4a2f-8aa1-bfd09934626e'
22+
23+
# Author of this module
24+
Author = 'Microsoft Corporation'
25+
26+
# Company or vendor of this module
27+
CompanyName = 'Microsoft Corporation'
28+
29+
# Copyright statement for this module
30+
Copyright = 'Microsoft Corporation. All rights reserved.'
31+
32+
# Description of the functionality provided by this module
33+
Description = '[PowerShell .Net Core] Microsoft Azure PowerShell - Analysis Services server management'
34+
35+
# Minimum version of the Windows PowerShell engine required by this module
36+
PowerShellVersion = '5.1'
37+
38+
# Name of the Windows PowerShell host required by this module
39+
# PowerShellHostName = ''
40+
41+
# Minimum version of the Windows PowerShell host required by this module
42+
# PowerShellHostVersion = ''
43+
44+
# Minimum version of Microsoft .NET Framework required by this module. This prerequisite is valid for the PowerShell Desktop edition only.
45+
# DotNetFrameworkVersion = ''
46+
47+
# Minimum version of the common language runtime (CLR) required by this module. This prerequisite is valid for the PowerShell Desktop edition only.
48+
# CLRVersion = ''
49+
50+
# Processor architecture (None, X86, Amd64) required by this module
51+
# ProcessorArchitecture = ''
52+
53+
# Modules that must be imported into the global environment prior to importing this module
54+
RequiredModules = @(@{ModuleName = 'AzureRM.Profile.Netcore'; ModuleVersion = '0.10.0'; })
55+
56+
# Assemblies that must be loaded prior to importing this module
57+
RequiredAssemblies = @()
58+
59+
# Script files (.ps1) that are run in the caller's environment prior to importing this module.
60+
# ScriptsToProcess = @()
61+
62+
# Type files (.ps1xml) to be loaded when importing this module
63+
# TypesToProcess = @()
64+
65+
# Format files (.ps1xml) to be loaded when importing this module
66+
# FormatsToProcess = @()
67+
68+
# Modules to import as nested modules of the module specified in RootModule/ModuleToProcess
69+
NestedModules = @('.\Microsoft.Azure.Commands.AnalysisServices.Dataplane.dll')
70+
71+
# Functions to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no functions to export.
72+
FunctionsToExport = '*'
73+
74+
# Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.
75+
CmdletsToExport = 'Add-AzureAnalysisServicesAccount',
76+
'Restart-AzureAnalysisServicesInstance',
77+
'Export-AzureAnalysisServicesInstanceLog',
78+
'Sync-AzureAnalysisServicesInstance'
79+
80+
# Variables to export from this module
81+
VariablesToExport = '*'
82+
83+
# Aliases to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no aliases to export.
84+
AliasesToExport = '*'
85+
86+
# DSC resources to export from this module
87+
# DscResourcesToExport = @()
88+
89+
# List of all modules packaged with this module
90+
# ModuleList = @()
91+
92+
# List of all files packaged with this module
93+
# FileList = @()
94+
95+
# Private data to pass to the module specified in RootModule/ModuleToProcess. This may also contain a PSData hashtable with additional module metadata used by PowerShell.
96+
PrivateData = @{
97+
98+
PSData = @{
99+
100+
# Tags applied to this module. These help with module discovery in online galleries.
101+
Tags = "Azure", "AzureAS", "AS"
102+
103+
# A URL to the license for this module.
104+
LicenseUri = 'https://aka.ms/azps-license'
105+
106+
# A URL to the main website for this project.
107+
ProjectUri = 'https://github.com/Azure/azure-powershell'
108+
109+
# A URL to an icon representing this module.
110+
# IconUri = ''
111+
112+
# ReleaseNotes of this module
113+
ReleaseNotes = ''
114+
115+
# Prerelease string of this module
116+
# Prerelease = ''
117+
118+
# Flag to indicate whether the module requires explicit user acceptance for install/update/save
119+
# RequireLicenseAcceptance = $false
120+
121+
# External dependent modules of this module
122+
# ExternalModuleDependencies = @()
123+
124+
} # End of PSData hashtable
125+
126+
} # End of PrivateData hashtable
127+
128+
# HelpInfo URI of this module
129+
# HelpInfoURI = ''
130+
131+
# Default prefix for commands exported from this module. Override the default prefix using Import-Module -Prefix.
132+
# DefaultCommandPrefix = ''
133+
134+
}
135+

‎src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/Commands.AnalysisServices.Dataplane.Netcore.csproj

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<Import Project="..\..\..\..\tools\Common.Netcore.Dependencies.targets" />
4+
5+
<PropertyGroup>
6+
<TargetFramework>netcoreapp2.0</TargetFramework>
7+
<AssemblyName>Microsoft.Azure.Commands.AnalysisServices.Dataplane</AssemblyName>
8+
<RootNamespace>Microsoft.Azure.Commands.AnalysisServices.Dataplane</RootNamespace>
9+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
10+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
11+
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
12+
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
13+
</PropertyGroup>
14+
15+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
16+
<OutputPath>..\..\..\Package\Debug\ResourceManager\AzureResourceManager\Azure.AnalysisServices.Netcore\</OutputPath>
17+
<DelaySign>false</DelaySign>
18+
<DefineConstants>TRACE;DEBUG;NETSTANDARD</DefineConstants>
19+
</PropertyGroup>
20+
21+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
22+
<OutputPath>..\..\..\Package\Release\ResourceManager\AzureResourceManager\Azure.AnalysisServices.Netcore\</OutputPath>
23+
<DocumentationFile />
24+
<SignAssembly>true</SignAssembly>
25+
<DelaySign>true</DelaySign>
26+
<AssemblyOriginatorKeyFile>MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
27+
<DefineConstants>TRACE;RELEASE;NETSTANDARD;SIGN</DefineConstants>
28+
</PropertyGroup>
29+
30+
<ItemGroup>
31+
<PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.10" />
32+
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure" Version="3.3.10" />
33+
<PackageReference Include="Microsoft.WindowsAzure.Management" Version="4.1.1" />
34+
</ItemGroup>
35+
36+
<ItemGroup>
37+
<None Include="Azure.AnalysisServices.Netcore.psd1">
38+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
39+
</None>
40+
</ItemGroup>
41+
42+
<ItemGroup>
43+
<ProjectReference Include="..\..\..\Common\Commands.Common.Authentication.Abstractions\Common.Authentication.Abstractions.Netcore.csproj" />
44+
<ProjectReference Include="..\..\..\Common\Commands.Common\Common.Netcore.csproj" />
45+
</ItemGroup>
46+
47+
<ItemGroup>
48+
<Compile Update="Properties\Resources.Designer.cs">
49+
<DesignTime>true</DesignTime>
50+
<AutoGen>true</AutoGen>
51+
<DependentUpon>Resources.resx</DependentUpon>
52+
</Compile>
53+
</ItemGroup>
54+
55+
<ItemGroup>
56+
<EmbeddedResource Update="Properties\Resources.resx">
57+
<Generator>ResXFileCodeGenerator</Generator>
58+
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
59+
</EmbeddedResource>
60+
</ItemGroup>
61+
62+
<ItemGroup>
63+
<Content Include="help\**\*" CopyToOutputDirectory="PreserveNewest" />
64+
</ItemGroup>
65+
66+
</Project>

‎src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/Commands.AnalysisServices.Dataplane.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<DelaySign>true</DelaySign>
3030
<DebugType>pdbonly</DebugType>
3131
<Optimize>true</Optimize>
32-
<OutputPath>..\..\..\Package\Release\ResourceManager\AzureResourceManager\Azure.AnalysisServices</OutputPath>
32+
<OutputPath>..\..\..\Package\Release\ResourceManager\AzureResourceManager\Azure.AnalysisServices\</OutputPath>
3333
<DefineConstants>TRACE</DefineConstants>
3434
<ErrorReport>prompt</ErrorReport>
3535
<WarningLevel>4</WarningLevel>

0 commit comments

Comments
 (0)