Skip to content

Commit d70dd8d

Browse files
author
Maddie Clayton
authored
Merge branch 'master' into installer
2 parents ab87e13 + 6f900b2 commit d70dd8d

File tree

92 files changed

+2398
-1279
lines changed

Some content is hidden

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

92 files changed

+2398
-1279
lines changed

‎Repo.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<Project>
22

3+
<!-- Custom -->
34
<PropertyGroup>
45
<RepoRoot>$(MSBuildThisFileDirectory)</RepoRoot>
56
<RepoSrc>$(RepoRoot)src\</RepoSrc>

‎documentation/migration-guides/Az.1.0.0-migration-guide.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ Scripts should no longer make processing decisions based on the values for these
256256
### Az.RecoveryServices (previously AzureRM.RecoveryServices, AzureRM.RecoveryServices.Backup, and AzureRM.RecoveryServices.SiteRecovery)
257257
- Removed `Encryption` parameter from `New/Set-AzRecoveryServicesAsrPolicy` cmdlets
258258
- `TargetStorageAccountName` parameter is now mandatory for managed disk restores in `Restore-AzRecoveryServicesBackupItem` cmdlet
259-
- Removed `StorageAccountName` and `StorageAccountResourceGroupName` parameters in `Restore-AzRecoveryServicesBackupItem` cmdlet
259+
- Removed `StorageAccountName` and `StorageAccountResourceGroupName` parameters in `Restore-AzRecoveryServicesBackupItem` cmdlet for Azure File Share restore
260260
- Removed `Name`parameter in `Get-AzRecoveryServicesBackupContainer` cmdlet
261261

262262
### Az.Resources (previously AzureRM.Resources)

‎src/Az.Shared.props‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<Project>
2+
3+
<!-- Custom -->
4+
<PropertyGroup>
5+
<AzAssemblyPrefix>Microsoft.Azure.PowerShell.Cmdlets.</AzAssemblyPrefix>
6+
<LegacyAssemblyPrefix>Microsoft.Azure.Commands.</LegacyAssemblyPrefix>
7+
</PropertyGroup>
8+
9+
<!-- CsProj -->
10+
<PropertyGroup>
11+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
12+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
13+
<WarningsAsErrors />
14+
</PropertyGroup>
15+
16+
</Project>

‎src/Az.Test.props‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<Project>
2+
3+
<Import Project="$(MSBuildThisFileDirectory)..\Repo.props" />
4+
<Import Project="$(RepoTools)Common.Netcore.Dependencies.Test.targets" />
5+
<Import Project="$(MSBuildThisFileDirectory)Az.Shared.props" />
6+
7+
<!-- Custom -->
8+
<PropertyGroup>
9+
<AzTestAssemblySuffix>.Test</AzTestAssemblySuffix>
10+
</PropertyGroup>
11+
12+
<!-- CsProj -->
13+
<PropertyGroup>
14+
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0</TargetFrameworks>
15+
<AssemblyName>$(AzAssemblyPrefix)$(PsModuleName)$(AzTestAssemblySuffix)</AssemblyName>
16+
<RootNamespace>$(AzAssemblyPrefix)$(PsModuleName)$(AzTestAssemblySuffix)</RootNamespace>
17+
<IsPackable>false</IsPackable>
18+
</PropertyGroup>
19+
20+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
21+
<DefineConstants>TRACE;DEBUG;NETSTANDARD</DefineConstants>
22+
</PropertyGroup>
23+
24+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
25+
<DefineConstants>TRACE;RELEASE;NETSTANDARD</DefineConstants>
26+
</PropertyGroup>
27+
28+
</Project>

‎src/Az.props‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,16 @@
22

33
<Import Project="$(MSBuildThisFileDirectory)..\Repo.props" />
44
<Import Project="$(RepoTools)Common.Netcore.Dependencies.targets" />
5+
<Import Project="$(MSBuildThisFileDirectory)Az.Shared.props" />
56

6-
<PropertyGroup>
7-
<AzAssemblyPrefix>Microsoft.Azure.PowerShell.Cmdlets.</AzAssemblyPrefix>
8-
<LegacyAssemblyPrefix>Microsoft.Azure.Commands.</LegacyAssemblyPrefix>
9-
</PropertyGroup>
10-
7+
<!-- CsProj -->
118
<PropertyGroup>
129
<TargetFramework>netstandard2.0</TargetFramework>
1310
<AssemblyName>$(AzAssemblyPrefix)$(PsModuleName)</AssemblyName>
1411
<RootNamespace>$(AzAssemblyPrefix)$(PsModuleName)</RootNamespace>
15-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
1612
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
1713
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
1814
<OutputPath>$(RepoArtifacts)$(Configuration)\ResourceManager\AzureResourceManager\Az.$(PsModuleName)\</OutputPath>
19-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
20-
<WarningsAsErrors />
2115
</PropertyGroup>
2216

2317
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

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

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<Import Project="$(ProjectDir)..\..\..\..\tools\Common.Netcore.Dependencies.Test.targets" />
4-
53
<PropertyGroup>
6-
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0</TargetFrameworks>
7-
<AssemblyName>Microsoft.Azure.PowerShell.Cmdlets.Aks.Test</AssemblyName>
8-
<RootNamespace>Microsoft.Azure.Commands.Aks.Test</RootNamespace>
9-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
10-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
11-
<WarningsAsErrors />
12-
<IsPackable>false</IsPackable>
4+
<PsModuleName>Aks</PsModuleName>
135
</PropertyGroup>
146

15-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
16-
<DelaySign>false</DelaySign>
17-
<DefineConstants>TRACE;DEBUG;NETSTANDARD</DefineConstants>
18-
</PropertyGroup>
7+
<Import Project="$(MSBuildThisFileDirectory)..\..\..\Az.Test.props" />
198

20-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
21-
<SignAssembly>true</SignAssembly>
22-
<DelaySign>true</DelaySign>
23-
<AssemblyOriginatorKeyFile>MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
24-
<DefineConstants>TRACE;RELEASE;NETSTANDARD;SIGN</DefineConstants>
9+
<PropertyGroup>
10+
<RootNamespace>$(LegacyAssemblyPrefix)$(PsModuleName)$(AzTestAssemblySuffix)</RootNamespace>
2511
</PropertyGroup>
2612

2713
<ItemGroup>

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

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<Import Project="$(ProjectDir)..\..\..\..\tools\Common.Netcore.Dependencies.Test.targets" />
4-
53
<PropertyGroup>
6-
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0</TargetFrameworks>
7-
<AssemblyName>Microsoft.Azure.PowerShell.Cmdlets.AnalysisServices.Test</AssemblyName>
8-
<RootNamespace>Microsoft.Azure.Commands.AnalysisServices.Test</RootNamespace>
9-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
10-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
11-
<WarningsAsErrors />
12-
<IsPackable>false</IsPackable>
4+
<PsModuleName>AnalysisServices</PsModuleName>
135
</PropertyGroup>
146

15-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
16-
<DelaySign>false</DelaySign>
17-
<DefineConstants>TRACE;DEBUG;NETSTANDARD</DefineConstants>
18-
</PropertyGroup>
7+
<Import Project="$(MSBuildThisFileDirectory)..\..\..\Az.Test.props" />
198

20-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
21-
<SignAssembly>true</SignAssembly>
22-
<DelaySign>true</DelaySign>
23-
<AssemblyOriginatorKeyFile>MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
24-
<DefineConstants>TRACE;RELEASE;NETSTANDARD;SIGN</DefineConstants>
9+
<PropertyGroup>
10+
<RootNamespace>$(LegacyAssemblyPrefix)$(PsModuleName)$(AzTestAssemblySuffix)</RootNamespace>
2511
</PropertyGroup>
2612

2713
<ItemGroup>

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

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<Import Project="$(ProjectDir)..\..\..\..\tools\Common.Netcore.Dependencies.Test.targets" />
4-
53
<PropertyGroup>
6-
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0</TargetFrameworks>
7-
<AssemblyName>Microsoft.Azure.PowerShell.Cmdlets.ApiManagement.Test</AssemblyName>
8-
<RootNamespace>Microsoft.Azure.Commands.ApiManagement.Test</RootNamespace>
9-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
10-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
11-
<WarningsAsErrors />
12-
<IsPackable>false</IsPackable>
4+
<PsModuleName>ApiManagement</PsModuleName>
135
</PropertyGroup>
146

15-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
16-
<DelaySign>false</DelaySign>
17-
<DefineConstants>TRACE;DEBUG;NETSTANDARD</DefineConstants>
18-
</PropertyGroup>
7+
<Import Project="$(MSBuildThisFileDirectory)..\..\..\Az.Test.props" />
198

20-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
21-
<SignAssembly>true</SignAssembly>
22-
<DelaySign>true</DelaySign>
23-
<AssemblyOriginatorKeyFile>MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
24-
<DefineConstants>TRACE;RELEASE;NETSTANDARD;SIGN</DefineConstants>
9+
<PropertyGroup>
10+
<RootNamespace>$(LegacyAssemblyPrefix)$(PsModuleName)$(AzTestAssemblySuffix)</RootNamespace>
2511
</PropertyGroup>
2612

2713
<ItemGroup>

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

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<Import Project="$(ProjectDir)..\..\..\..\tools\Common.Netcore.Dependencies.Test.targets" />
4-
53
<PropertyGroup>
6-
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0</TargetFrameworks>
7-
<AssemblyName>Microsoft.Azure.PowerShell.Cmdlets.ApiManagement.ServiceManagement.Test</AssemblyName>
8-
<RootNamespace>Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Test</RootNamespace>
9-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
10-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
11-
<WarningsAsErrors />
4+
<PsModuleName>ApiManagement.ServiceManagement</PsModuleName>
125
</PropertyGroup>
136

14-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
15-
<DelaySign>false</DelaySign>
16-
<DefineConstants>TRACE;DEBUG;NETSTANDARD</DefineConstants>
17-
</PropertyGroup>
7+
<Import Project="$(MSBuildThisFileDirectory)..\..\..\Az.Test.props" />
188

19-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
20-
<SignAssembly>true</SignAssembly>
21-
<DelaySign>true</DelaySign>
22-
<AssemblyOriginatorKeyFile>MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
23-
<DefineConstants>TRACE;RELEASE;NETSTANDARD;SIGN</DefineConstants>
9+
<PropertyGroup>
10+
<RootNamespace>$(LegacyAssemblyPrefix)$(PsModuleName)$(AzTestAssemblySuffix)</RootNamespace>
2411
</PropertyGroup>
2512

2613
<ItemGroup>

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

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<Import Project="$(ProjectDir)..\..\..\..\tools\Common.Netcore.Dependencies.Test.targets" />
4-
53
<PropertyGroup>
6-
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0</TargetFrameworks>
7-
<AssemblyName>Microsoft.Azure.PowerShell.Cmdlets.ApplicationInsights.Test</AssemblyName>
8-
<RootNamespace>Microsoft.Azure.Commands.ApplicationInsights.Test</RootNamespace>
9-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
10-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
11-
<WarningsAsErrors />
12-
<IsPackable>false</IsPackable>
4+
<PsModuleName>ApplicationInsights</PsModuleName>
135
</PropertyGroup>
146

15-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
16-
<DelaySign>false</DelaySign>
17-
<DefineConstants>TRACE;DEBUG;NETSTANDARD</DefineConstants>
18-
</PropertyGroup>
7+
<Import Project="$(MSBuildThisFileDirectory)..\..\..\Az.Test.props" />
198

20-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
21-
<SignAssembly>true</SignAssembly>
22-
<DelaySign>true</DelaySign>
23-
<AssemblyOriginatorKeyFile>MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
24-
<DefineConstants>TRACE;RELEASE;NETSTANDARD;SIGN</DefineConstants>
9+
<PropertyGroup>
10+
<RootNamespace>$(LegacyAssemblyPrefix)$(PsModuleName)$(AzTestAssemblySuffix)</RootNamespace>
2511
</PropertyGroup>
2612

2713
<ItemGroup>

0 commit comments

Comments
 (0)