Skip to content

Commit 19a8092

Browse files
wilcobmsftwilcobmsft
committed
Merge branch 'preview' into wilcob/enrollmentAccounts
2 parents 4042902 + d91c52b commit 19a8092

File tree

1,366 files changed

+1173153
-2477270
lines changed

Some content is hidden

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

1,366 files changed

+1173153
-2477270
lines changed

‎Azure.PowerShell.Netcore.sln

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
4-
VisualStudioVersion = 15.0.27130.2010
4+
VisualStudioVersion = 15.0.27130.2027
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Authentication.Netcore", "src\Common\Commands.Common.Authentication\Common.Authentication.Netcore.csproj", "{D12674F6-CB92-438F-A68D-21CE12F8611B}"
77
EndProject
@@ -51,6 +51,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Strategies.Netcore",
5151
EndProject
5252
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Common.Tests", "src\Common\Commands.Common.Tests\Commands.Common.Tests.csproj", "{B0EF35E9-2D7A-4AAE-8A1A-728B6CC8524B}"
5353
EndProject
54+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Common.Compute.Netcore", "src\Common\Commands.Common.Compute\Commands.Common.Compute.Netcore.csproj", "{5E5D1F8E-92C8-40EB-AABA-DFD12AFD6D0A}"
55+
EndProject
5456
Global
5557
GlobalSection(SolutionConfigurationPlatforms) = preSolution
5658
Debug|Any CPU = Debug|Any CPU
@@ -205,18 +207,6 @@ Global
205207
{AF50ACE6-9A6A-4A18-8140-B6C5BDD0EFD6}.Release|x64.Build.0 = Release|Any CPU
206208
{AF50ACE6-9A6A-4A18-8140-B6C5BDD0EFD6}.Release|x86.ActiveCfg = Release|Any CPU
207209
{AF50ACE6-9A6A-4A18-8140-B6C5BDD0EFD6}.Release|x86.Build.0 = Release|Any CPU
208-
{7B61AB3B-9F62-4B96-BCED-13920B56CD3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
209-
{7B61AB3B-9F62-4B96-BCED-13920B56CD3C}.Debug|Any CPU.Build.0 = Debug|Any CPU
210-
{7B61AB3B-9F62-4B96-BCED-13920B56CD3C}.Debug|x64.ActiveCfg = Debug|Any CPU
211-
{7B61AB3B-9F62-4B96-BCED-13920B56CD3C}.Debug|x64.Build.0 = Debug|Any CPU
212-
{7B61AB3B-9F62-4B96-BCED-13920B56CD3C}.Debug|x86.ActiveCfg = Debug|Any CPU
213-
{7B61AB3B-9F62-4B96-BCED-13920B56CD3C}.Debug|x86.Build.0 = Debug|Any CPU
214-
{7B61AB3B-9F62-4B96-BCED-13920B56CD3C}.Release|Any CPU.ActiveCfg = Release|Any CPU
215-
{7B61AB3B-9F62-4B96-BCED-13920B56CD3C}.Release|Any CPU.Build.0 = Release|Any CPU
216-
{7B61AB3B-9F62-4B96-BCED-13920B56CD3C}.Release|x64.ActiveCfg = Release|Any CPU
217-
{7B61AB3B-9F62-4B96-BCED-13920B56CD3C}.Release|x64.Build.0 = Release|Any CPU
218-
{7B61AB3B-9F62-4B96-BCED-13920B56CD3C}.Release|x86.ActiveCfg = Release|Any CPU
219-
{7B61AB3B-9F62-4B96-BCED-13920B56CD3C}.Release|x86.Build.0 = Release|Any CPU
220210
{40ACDC82-5A87-4D52-83B5-ED21274363A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
221211
{40ACDC82-5A87-4D52-83B5-ED21274363A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
222212
{40ACDC82-5A87-4D52-83B5-ED21274363A5}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -337,6 +327,18 @@ Global
337327
{B0EF35E9-2D7A-4AAE-8A1A-728B6CC8524B}.Release|x64.Build.0 = Release|Any CPU
338328
{B0EF35E9-2D7A-4AAE-8A1A-728B6CC8524B}.Release|x86.ActiveCfg = Release|Any CPU
339329
{B0EF35E9-2D7A-4AAE-8A1A-728B6CC8524B}.Release|x86.Build.0 = Release|Any CPU
330+
{5E5D1F8E-92C8-40EB-AABA-DFD12AFD6D0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
331+
{5E5D1F8E-92C8-40EB-AABA-DFD12AFD6D0A}.Debug|Any CPU.Build.0 = Debug|Any CPU
332+
{5E5D1F8E-92C8-40EB-AABA-DFD12AFD6D0A}.Debug|x64.ActiveCfg = Debug|Any CPU
333+
{5E5D1F8E-92C8-40EB-AABA-DFD12AFD6D0A}.Debug|x64.Build.0 = Debug|Any CPU
334+
{5E5D1F8E-92C8-40EB-AABA-DFD12AFD6D0A}.Debug|x86.ActiveCfg = Debug|Any CPU
335+
{5E5D1F8E-92C8-40EB-AABA-DFD12AFD6D0A}.Debug|x86.Build.0 = Debug|Any CPU
336+
{5E5D1F8E-92C8-40EB-AABA-DFD12AFD6D0A}.Release|Any CPU.ActiveCfg = Release|Any CPU
337+
{5E5D1F8E-92C8-40EB-AABA-DFD12AFD6D0A}.Release|Any CPU.Build.0 = Release|Any CPU
338+
{5E5D1F8E-92C8-40EB-AABA-DFD12AFD6D0A}.Release|x64.ActiveCfg = Release|Any CPU
339+
{5E5D1F8E-92C8-40EB-AABA-DFD12AFD6D0A}.Release|x64.Build.0 = Release|Any CPU
340+
{5E5D1F8E-92C8-40EB-AABA-DFD12AFD6D0A}.Release|x86.ActiveCfg = Release|Any CPU
341+
{5E5D1F8E-92C8-40EB-AABA-DFD12AFD6D0A}.Release|x86.Build.0 = Release|Any CPU
340342
EndGlobalSection
341343
GlobalSection(SolutionProperties) = preSolution
342344
HideSolutionNode = FALSE

‎ChangeLog.md

Lines changed: 59 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,62 @@
1-
## 5.5.0 - March 2018
1+
## 5.6.0 - March 2018
2+
3+
#### General
4+
* Fix issue with Default Resource Group in CloudShell
5+
* Fix issue where incorrect startup scripts were being executed during module import
6+
7+
#### AzureRM.Profile
8+
* Enable MSI authentication in unsupported scenarios
9+
* Add support for user-defined Managed Service Identity
10+
11+
#### AzureRM.AnalysisServices
12+
* Fixed issue with cleaning up scripts in build
13+
14+
#### AzureRM.Cdn
15+
* Fixed issue with cleaning up scripts in build
16+
17+
#### AzureRM.Compute
18+
* 'New-AzureRmVM' and 'New-AzureRmVMSS' support data disks.
19+
* 'New-AzureRmVM' and 'New-AzureRmVMSS' support custom image by name or by id.
20+
* Log analytic feature
21+
- Added 'Export-AzureRmLogAnalyticRequestRateByInterval' cmdlet
22+
- Added 'Export-AzureRmLogAnalyticThrottledRequests' cmdlet
23+
24+
#### AzureRM.ContainerInstance
25+
* Fix parameter sets issue for container registry and azure file volume mount
26+
27+
#### AzureRM.DataFactoryV2
28+
* Updated the ADF .Net SDK to version 0.6.0-preview containing the following changes:
29+
- Added new AzureDatabricks LinkedService and DatabricksNotebook Activity
30+
- Added headNodeSize and dataNodeSize properties in HDInsightOnDemand LinkedService
31+
- Added LinkedService, Dataset, CopySource for SalesforceMarketingCloud
32+
- Added support for SecureOutput on all activities
33+
- Added new BatchCount property on ForEach activity which control how many concurrent activities to run
34+
- Added new Filter Activity
35+
- Added Linked Service Parameters support
36+
37+
#### AzureRM.Dns
38+
* Support for Private DNS Zones (Public Preview)
39+
- Adds ability to create DNS zones that are visible only to the associated virtual networks
40+
41+
#### AzureRM.Network
42+
* Updating model types for compatibility with DNS cmdlets.
43+
44+
#### AzureRM.RecoveryServices.SiteRecovery
45+
* Changes for ASR Azure to Azure Site Recovery (cmdlets are currently supporting operations for Enterprise to Enterprise, Enterprise to Azure, HyperV to Azure,VMware to Azure)
46+
- New-AzureRmRecoveryServicesAsrProtectionContainer
47+
- New-AzureRmRecoveryServicesAsrAzureToAzureDiskReplicationConfig
48+
- Remove-AzureRmRecoveryServicesAsrProtectionContainer
49+
- Update-AzureRmRecoveryServicesAsrProtectionDirection
50+
51+
#### AzureRM.Storage
52+
* Obsolete following parameters in new and set Storage Account cmdlets: EnableEncryptionService and DisableEncryptionService, since Encryption at Rest is enabled by default and can't be disabled.
53+
- New-AzureRmStorageAccount
54+
- Set-AzureRmStorageAccount
55+
56+
#### AzureRM.Websites
57+
* Fixed the help for Remove-AzureRmWebAppSlot
58+
59+
## 5.5.0 - March 2018
260
#### AzureRM.Profile
361
* Fixed issue with importing aliases
462
* Load version 10.0.3 of Newtonsoft.Json side-by-side with version 6.0.8

‎build.proj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@
298298
<Delete Files="@(ExtraPsdFiles->'%(FullPath)')"/>
299299

300300
<!-- Update module manifests. -->
301-
<Exec Command="&quot;$(PowerShellCoreCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\UpdateModules.ps1 $(Configuration) AzureRM.Netcore -Profile Latest &quot; " Condition="'$(Latest)' == 'true' and '$(CodeSign)' == 'false'" ContinueOnError="false" />
301+
<Exec Command="&quot;$(PowerShellCoreCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\UpdateModules.ps1 $(Configuration) AzureRM.Netcore -Profile Latest &quot; " Condition="'$(Latest)' == 'true'" ContinueOnError="false" />
302302

303303
<!-- Generate the help. -->
304304
<Exec Command="&quot;$(PowerShellCoreCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;Set-Variable -Name ProgressPreference -Value 'SilentlyContinue';. $(LibraryToolsFolder)\GenerateHelp.ps1 -GenerateMamlHelp -BuildConfig $(Configuration) &quot;" ContinueOnError="true" Condition=" '$(SkipHelp)' == 'false' and '$(Latest)' == 'true'"/>
@@ -372,8 +372,8 @@
372372
ContinueOnError="false"
373373
Condition="!$(DelaySign) and '@(DelaySignedAssembliesToSign)' != ''"/>
374374

375-
<Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\UpdateModules.ps1 $(Configuration) $(Scope) -Profile Latest &quot; " Condition="'$(Latest)' == 'true' "/>
376-
<Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\UpdateModules.ps1 $(Configuration) $(Scope) -Profile Stack &quot; " Condition="'$(Stack)' == 'true' "/>
375+
<Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\UpdateModules.ps1 $(Configuration) $(Scope) -Profile Latest &quot; " Condition="'$(Latest)' == 'true' and '$(NetCore)' == 'false' "/>
376+
<Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\UpdateModules.ps1 $(Configuration) $(Scope) -Profile Stack &quot; " Condition="'$(Stack)' == 'true' and '$(NetCore)' == 'false' "/>
377377

378378
<!-- Copying shortcut to be signed -->
379379
<Copy SourceFiles="$(LibraryRoot)tools\AzureRM\AzureRM.psm1"

‎src/Common/Commands.Common.Authentication.Abstractions/AzureAccount.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,12 @@ public static class Property
123123
/// <summary>
124124
/// Login Uri for Managed Service Login
125125
/// </summary>
126-
MSILoginUri = "MSILoginUri";
126+
MSILoginUri = "MSILoginUri",
127+
128+
/// <summary>
129+
/// Backup login Uri for MSI
130+
/// </summary>
131+
MSILoginUriBackup = "MSILoginBackup";
127132

128133

129134
}

‎src/Common/Commands.Common.Authentication.Abstractions/Commands.Common.Authentication.Abstractions.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<Private>True</Private>
5959
</Reference>
6060
<Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
61-
<HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.2.3.10\lib\net452\Microsoft.Rest.ClientRuntime.dll</HintPath>
61+
<HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.2.3.11\lib\net452\Microsoft.Rest.ClientRuntime.dll</HintPath>
6262
<Private>True</Private>
6363
</Reference>
6464
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">

‎src/Common/Commands.Common.Authentication.Abstractions/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net452" />
88
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net452" />
99
<package id="Microsoft.Net.Http" version="2.2.22" targetFramework="net452" />
10-
<package id="Microsoft.Rest.ClientRuntime" version="2.3.10" targetFramework="net452" />
10+
<package id="Microsoft.Rest.ClientRuntime" version="2.3.11" targetFramework="net452" />
1111
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net452" />
1212
</packages>

0 commit comments

Comments
 (0)