Skip to content

Commit b823d3a

Browse files
authored
Merge branch 'preview' into asr_managedDisk
2 parents a18313a + e77ef17 commit b823d3a

File tree

284 files changed

+4710
-2123
lines changed

Some content is hidden

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

284 files changed

+4710
-2123
lines changed

.travis.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
sudo: required
22
language: csharp
33
mono: none
4-
dotnet: 2.1.200
4+
dotnet: 2.1.302
55
dist: trusty
66

77
env:
@@ -15,7 +15,11 @@ before_install:
1515
- sudo apt-get install docker-ce
1616
- curl https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -
1717
- curl https://packages.microsoft.com/config/ubuntu/14.04/prod.list | sudo tee /etc/apt/sources.list.d/microsoft.list
18+
- wget -q https://packages.microsoft.com/config/ubuntu/14.04/packages-microsoft-prod.deb
19+
- sudo dpkg -i packages-microsoft-prod.deb
20+
- sudo apt-get install apt-transport-https
1821
- sudo apt-get update
22+
- sudo apt-get install dotnet-sdk-2.1
1923
- sudo apt-get install -y powershell
2024
- sudo pwsh -NonInteractive -NoLogo -NoProfile -Command "Install-Module platyPS -Force -Confirm:\$false -Scope CurrentUser"
2125

ChangeLog.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## 6.7.0 - August 2018
1+
## 6.7.0 - August 2018
22
#### AzureRM.Profile
33
* Updated to the latest version of the Azure ClientRuntime.
44
* Add user id to default context name to avoid context clashing

NuGet.config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,5 @@
77
<add key="powershell-core" value="https://powershell.myget.org/F/powershell-core/api/v3/index.json" />
88
</packageSources>
99
<disabledPackageSources>
10-
<add key="dotnet-core" value="true" />
1110
</disabledPackageSources>
1211
</configuration>

documentation/development-docs/azure-powershell-developer-guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ The Azure PowerShell Developer Guide was created to help with the development an
5050

5151
The following prerequisites should be completed before contributing to the Azure PowerShell repository:
5252

53-
- Install [Visual Studio 2015](https://www.visualstudio.com/downloads/)
53+
- Install [Visual Studio 2017](https://www.visualstudio.com/downloads/)
5454
- Install the latest version of [Git](https://git-scm.com/downloads)
5555
- Install the [`platyPS` module](https://github.com/Azure/azure-powershell/blob/preview/documentation/development-docs/help-generation.md#installing-platyps)
5656
- Set the PowerShell [execution policy](https://technet.microsoft.com/en-us/library/ee176961.aspx) to **Unrestricted** for the following versions of PowerShell:

src/Common/Commands.Common.Aks/Commands.Common.Aks.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\..\..\tools\Common.Netcore.Dependencies.targets" />
44

55
<PropertyGroup>
6-
<TargetFramework>netcoreapp2.0</TargetFramework>
6+
<TargetFramework>netstandard2.0</TargetFramework>
77
<AssemblyName>Microsoft.Azure.Commands.Common.Aks</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Commands.Common.Aks</RootNamespace>
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\..\..\tools\Common.Netcore.Dependencies.targets" />
44

55
<PropertyGroup>
6-
<TargetFramework>netcoreapp2.0</TargetFramework>
6+
<TargetFramework>netstandard2.0</TargetFramework>
77
<AssemblyName>Microsoft.Azure.Commands.Common.Authentication.Abstractions</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Commands.Common.Authentication.Abstractions</RootNamespace>
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

src/Common/Commands.Common.Authentication.Test/Commands.Common.Authentication.Test.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\..\..\..\tools\Common.Netcore.Dependencies.Test.targets" />
44

55
<PropertyGroup>
6-
<TargetFramework>netcoreapp2.0</TargetFramework>
6+
<TargetFramework>netcoreapp2.1</TargetFramework>
77
<AssemblyName>Microsoft.Azure.Commands.Common.Authentication.Test</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Commands.Common.Authentication.Test</RootNamespace>
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

src/Common/Commands.Common.Authentication/Common.Authentication.Netcore.csproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\..\..\tools\Common.Netcore.Dependencies.targets" />
44

55
<PropertyGroup>
6-
<TargetFramework>netcoreapp2.0</TargetFramework>
6+
<TargetFramework>netstandard2.0</TargetFramework>
77
<AssemblyName>Microsoft.Azure.Commands.Common.Authentication</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Commands.Common.Authentication</RootNamespace>
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@@ -25,6 +25,10 @@
2525
<WarningsAsErrors />
2626
</PropertyGroup>
2727

28+
<ItemGroup>
29+
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication" Version="2.4.0" />
30+
</ItemGroup>
31+
2832
<ItemGroup>
2933
<Compile Remove="Authentication\ConsoleParentWindow.cs" />
3034
<Compile Remove="Authentication\CredStore.cs" />

src/Common/Commands.Common.Authorization/Common.Authorization.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\..\..\tools\Common.Netcore.Dependencies.targets" />
44

55
<PropertyGroup>
6-
<TargetFramework>netcoreapp2.0</TargetFramework>
6+
<TargetFramework>netstandard2.0</TargetFramework>
77
<AssemblyName>Microsoft.Azure.Commands.Common.Authorization</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Commands.Common.Authorization</RootNamespace>
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

src/Common/Commands.Common.Compute.Tests/Common.Compute.Tests.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\..\..\..\tools\Common.Netcore.Dependencies.Test.targets" />
44

55
<PropertyGroup>
6-
<TargetFramework>netcoreapp2.0</TargetFramework>
6+
<TargetFramework>netstandard2.0</TargetFramework>
77
<AssemblyName>Microsoft.Azure.Commands.Common.Compute.Tests</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Commands.Common.Compute.Tests</RootNamespace>
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

src/Common/Commands.Common.Compute/Common.Compute.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\..\..\tools\Common.Netcore.Dependencies.targets" />
44

55
<PropertyGroup>
6-
<TargetFramework>netcoreapp2.0</TargetFramework>
6+
<TargetFramework>netstandard2.0</TargetFramework>
77
<AssemblyName>Microsoft.Azure.Commands.Common.Compute</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Commands.Common.Compute</RootNamespace>
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

src/Common/Commands.Common.Graph.RBAC/Common.Rbac.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\..\..\tools\Common.Netcore.Dependencies.targets" />
44

55
<PropertyGroup>
6-
<TargetFramework>netcoreapp2.0</TargetFramework>
6+
<TargetFramework>netstandard2.0</TargetFramework>
77
<AssemblyName>Microsoft.Azure.Commands.Common.Graph.RBAC</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Commands.Common.Graph.RBAC</RootNamespace>
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

src/Common/Commands.Common.KeyVault/Common.KeyVault.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\..\..\tools\Common.Netcore.Dependencies.targets" />
44

55
<PropertyGroup>
6-
<TargetFramework>netcoreapp2.0</TargetFramework>
6+
<TargetFramework>netstandard2.0</TargetFramework>
77
<AssemblyName>Microsoft.Azure.Commands.Common.KeyVault</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Commands.Common.KeyVault</RootNamespace>
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

src/Common/Commands.Common.Network/Common.Network.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\..\..\tools\Common.Netcore.Dependencies.targets" />
44

55
<PropertyGroup>
6-
<TargetFramework>netcoreapp2.0</TargetFramework>
6+
<TargetFramework>netstandard2.0</TargetFramework>
77
<AssemblyName>Microsoft.Azure.Commands.Common.Network</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Commands.Common.Network</RootNamespace>
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

src/Common/Commands.Common.Storage.Management/Common.Storage.Management.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\..\..\tools\Common.Netcore.Dependencies.targets" />
44

55
<PropertyGroup>
6-
<TargetFramework>netcoreapp2.0</TargetFramework>
6+
<TargetFramework>netstandard2.0</TargetFramework>
77
<AssemblyName>Microsoft.Azure.Commands.Common.Storage.Management</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Commands.Common.Storage.Management</RootNamespace>
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

src/Common/Commands.Common.Storage/Common.Storage.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\..\..\tools\Common.Netcore.Dependencies.targets" />
44

55
<PropertyGroup>
6-
<TargetFramework>netcoreapp2.0</TargetFramework>
6+
<TargetFramework>netstandard2.0</TargetFramework>
77
<AssemblyName>Microsoft.WindowsAzure.Commands.Common.Storage</AssemblyName>
88
<RootNamespace>Microsoft.WindowsAzure.Commands.Common.Storage</RootNamespace>
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

src/Common/Commands.Common.Tests/Common.Tests.Netcore.csproj

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,15 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3+
<Import Project="..\..\..\tools\Common.Netcore.Dependencies.Test.targets" />
4+
35
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.0</TargetFramework>
6+
<TargetFramework>netcoreapp2.1</TargetFramework>
57
<IsPackable>false</IsPackable>
68
<DefineConstants>TRACE;DEBUG;NETSTANDARD</DefineConstants>
79
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
810
<WarningsAsErrors />
911
</PropertyGroup>
1012

11-
<ItemGroup>
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
13-
<PackageReference Include="xunit" Version="2.3.1" />
14-
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
15-
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
16-
</ItemGroup>
1713

1814
<ItemGroup>
1915
<ProjectReference Include="..\..\ResourceManager\Common\Commands.ScenarioTests.ResourceManager.Common\Common.ResourceManager.ScenarioTests.Netcore.csproj" />

src/Common/Commands.Common.Websites/Common.Websites.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\..\..\tools\Common.Netcore.Dependencies.targets" />
44

55
<PropertyGroup>
6-
<TargetFramework>netcoreapp2.0</TargetFramework>
6+
<TargetFramework>netstandard2.0</TargetFramework>
77
<AssemblyName>Microsoft.Azure.Commands.Common.Websites</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Commands.Common.Websites</RootNamespace>
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

src/Common/Commands.Common/AzureLongRunningJob.cs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ public override void Cancel()
444444
// Members for implementing command runtime for this job
445445
public PSTransactionContext CurrentPSTransaction
446446
{
447-
get
447+
get
448448
{
449449
return _runtime.CurrentPSTransaction;
450450
}
@@ -461,6 +461,18 @@ public PSHost Host
461461
}
462462
}
463463

464+
/// <summary>
465+
/// Determine if Ambient transaction is available
466+
/// </summary>
467+
/// <returns>True if an ambient transaction is available, otherwise false</returns>
468+
public bool TransactionAvailable()
469+
{
470+
ThrowIfJobFailedOrCancelled();
471+
Exception thrownException;
472+
return InvokeShouldMethodAndWaitForResults(cmdlet => cmdlet.TransactionAvailable(),
473+
ShouldMethodType.HasTransaction, out thrownException);
474+
}
475+
464476
/// <summary>
465477
/// Prompt the user to continue
466478
/// </summary>
@@ -653,18 +665,6 @@ public void ThrowTerminatingError(ErrorRecord errorRecord)
653665
}
654666
}
655667

656-
/// <summary>
657-
/// Determine if an ambient transaction is available
658-
/// </summary>
659-
/// <returns>True if an ambient transaction is available, otherwise false</returns>
660-
public bool TransactionAvailable()
661-
{
662-
ThrowIfJobFailedOrCancelled();
663-
Exception thrownException;
664-
return InvokeShouldMethodAndWaitForResults(cmdlet => cmdlet.TransactionAvailable(),
665-
ShouldMethodType.HasTransaction, out thrownException);
666-
}
667-
668668
/// <summary>
669669
/// Write details about a command
670670
/// </summary>

src/Common/Commands.Common/Common.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\..\..\tools\Common.Netcore.Dependencies.targets" />
44

55
<PropertyGroup>
6-
<TargetFramework>netcoreapp2.0</TargetFramework>
6+
<TargetFramework>netstandard2.0</TargetFramework>
77
<AssemblyName>Microsoft.WindowsAzure.Commands.Common</AssemblyName>
88
<RootNamespace>Microsoft.WindowsAzure.Commands.Common</RootNamespace>
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

src/ResourceManager/Aks/Commands.Aks.Test/Commands.Aks.Test.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\..\..\..\tools\Common.Netcore.Dependencies.Test.targets" />
44

55
<PropertyGroup>
6-
<TargetFramework>netcoreapp2.0</TargetFramework>
6+
<TargetFramework>netcoreapp2.1</TargetFramework>
77
<AssemblyName>Microsoft.Azure.Commands.Aks.Test</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Commands.Aks.Test</RootNamespace>
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

src/ResourceManager/Aks/Commands.Aks/Az.Aks.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
ModuleVersion = '0.1.0'
1616

1717
# Supported PSEditions
18-
CompatiblePSEditions = 'Core'
18+
CompatiblePSEditions = 'Core', 'Desktop'
1919

2020
# ID used to uniquely identify this module
2121
GUID = 'a97e0c3e-e389-46a6-b73d-2b9bd6909bdb'

src/ResourceManager/Aks/Commands.Aks/Commands.Aks.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\..\..\..\tools\Common.Netcore.Dependencies.targets" />
44

55
<PropertyGroup>
6-
<TargetFramework>netcoreapp2.0</TargetFramework>
6+
<TargetFramework>netstandard2.0</TargetFramework>
77
<AssemblyName>Microsoft.Azure.Commands.Aks</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Commands.Aks</RootNamespace>
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\..\..\..\tools\Common.Netcore.Dependencies.targets" />
44

55
<PropertyGroup>
6-
<TargetFramework>netcoreapp2.0</TargetFramework>
6+
<TargetFramework>netstandard2.0</TargetFramework>
77
<AssemblyName>Microsoft.Azure.Commands.AnalysisServices.Dataplane</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Commands.AnalysisServices.Dataplane</RootNamespace>
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Test/Commands.AnalysisServices.Test.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\..\..\..\tools\Common.Netcore.Dependencies.Test.targets" />
44

55
<PropertyGroup>
6-
<TargetFramework>netcoreapp2.0</TargetFramework>
6+
<TargetFramework>netcoreapp2.1</TargetFramework>
77
<AssemblyName>Microsoft.Azure.Commands.AnalysisServices.Test</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Commands.AnalysisServices.Test</RootNamespace>
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

src/ResourceManager/AnalysisServices/Commands.AnalysisServices/Az.AnalysisServices.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
ModuleVersion = '0.1.0'
1616

1717
# Supported PSEditions
18-
CompatiblePSEditions = 'Core'
18+
CompatiblePSEditions = 'Core', 'Desktop'
1919

2020
# ID used to uniquely identify this module
2121
GUID = 'd4877565-4778-42de-b494-79491ab9c31c'

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\..\..\..\tools\Common.Netcore.Dependencies.targets" />
44

55
<PropertyGroup>
6-
<TargetFramework>netcoreapp2.0</TargetFramework>
6+
<TargetFramework>netstandard2.0</TargetFramework>
77
<AssemblyName>Microsoft.Azure.Commands.AnalysisServices</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Commands.AnalysisServices</RootNamespace>
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@@ -33,6 +33,8 @@
3333

3434
<ItemGroup>
3535
<PackageReference Include="Microsoft.Azure.Management.Analysis" Version="2.0.3" />
36+
<PackageReference Include="Microsoft.NETCore.Platforms" Version="2.1.0" />
37+
<PackageReference Include="System.Security.Permissions" Version="4.5.0" />
3638
</ItemGroup>
3739

3840
<ItemGroup>

src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands.ApiManagement.ServiceManagement.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\..\..\..\tools\Common.Netcore.Dependencies.targets" />
44

55
<PropertyGroup>
6-
<TargetFramework>netcoreapp2.0</TargetFramework>
6+
<TargetFramework>netstandard2.0</TargetFramework>
77
<AssemblyName>Microsoft.Azure.Commands.ApiManagement.ServiceManagement</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Commands.ApiManagement.ServiceManagement</RootNamespace>
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/Commands.ApiManagement.Test.Netcore.csproj

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33
<Import Project="..\..\..\..\tools\Common.Netcore.Dependencies.Test.targets" />
44

55
<PropertyGroup>
6-
<TargetFramework>netcoreapp2.0</TargetFramework>
6+
<TargetFramework>netcoreapp2.1</TargetFramework>
77
<AssemblyName>Microsoft.Azure.Commands.ApiManagement.Test</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Commands.ApiManagement.Test</RootNamespace>
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
10+
<IsPackable>false</IsPackable>
1011
</PropertyGroup>
1112

1213
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -66,4 +67,10 @@
6667
</None>
6768
</ItemGroup>
6869

70+
<ItemGroup>
71+
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="15.8.0" />
72+
<PackageReference Update="xunit" Version="2.4.0" />
73+
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.0" />
74+
</ItemGroup>
75+
6976
</Project>

src/ResourceManager/ApiManagement/Commands.ApiManagement/Az.ApiManagement.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
ModuleVersion = '0.1.0'
1616

1717
# Supported PSEditions
18-
CompatiblePSEditions = 'Core'
18+
CompatiblePSEditions = 'Core', 'Desktop'
1919

2020
# ID used to uniquely identify this module
2121
GUID = '4f58d643-631f-4d13-a205-15292af40748'

src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands.ApiManagement.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\..\..\..\tools\Common.Netcore.Dependencies.targets" />
44

55
<PropertyGroup>
6-
<TargetFramework>netcoreapp2.0</TargetFramework>
6+
<TargetFramework>netstandard2.0</TargetFramework>
77
<AssemblyName>Microsoft.Azure.Commands.ApiManagement</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Commands.ApiManagement</RootNamespace>
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

src/ResourceManager/ApiManagement/Commands.SMAPI.Test/Commands.ApiManagement.ServiceManagement.Test.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\..\..\..\tools\Common.Netcore.Dependencies.Test.targets" />
44

55
<PropertyGroup>
6-
<TargetFramework>netcoreapp2.0</TargetFramework>
6+
<TargetFramework>netcoreapp2.1</TargetFramework>
77
<AssemblyName>Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Test</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Test</RootNamespace>
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

src/ResourceManager/ApplicationInsights/Commands.ApplicationInsights.Test/Commands.ApplicationInsights.Test.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\..\..\..\tools\Common.Netcore.Dependencies.Test.targets" />
44

55
<PropertyGroup>
6-
<TargetFramework>netcoreapp2.0</TargetFramework>
6+
<TargetFramework>netcoreapp2.1</TargetFramework>
77
<AssemblyName>Microsoft.Azure.Commands.ApplicationInsights.Test</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Commands.ApplicationInsights.Test</RootNamespace>
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

0 commit comments

Comments
 (0)