Remove SiteRecovery psd1 for Az

.travis.yml

@@ -25,7 +25,7 @@ before_install:
  # https://github.com/travis-ci/travis-ci/issues/1066#issuecomment-383489298
 script:
  - sudo dotnet msbuild build.proj /t:BuildNetcore /p:Configuration=$CONFIG || travis_terminate 1
- - sudo dotnet tools/StaticAnalysis/bin/$CONFIG/netcoreapp2.1/StaticAnalysis.Netcore.dll -p src/Package/$CONFIG -r src/Package -u || travis_terminate 1
+ - sudo dotnet src/Package/StaticAnalysis/StaticAnalysis.Netcore.dll -p $TRAVIS_BUILD_DIR/src/Package/$CONFIG -r $TRAVIS_BUILD_DIR/src/Package/StaticAnalysis -u || travis_terminate 1
  - sudo pwsh -NonInteractive -NoLogo -NoProfile -File tools/TestModuleLoading.ps1 || travis_terminate 1
  - sudo dotnet pack src/TestPrerequisites/Common.TestPrerequisites.sln --configuration $CONFIG || travis_terminate 1
  - sudo dotnet test src/Azure.PowerShell.Netcore.Test.sln --filter "AcceptanceType=CheckIn&RunType!=DesktopOnly" --configuration $CONFIG --framework netcoreapp2.0

src/ResourceManager/RecoveryServices/Commands.RecoveryServices.SiteRecovery/Commands.RecoveryServices.SiteRecovery.Netcore.csproj

@@ -33,12 +33,6 @@
     <PackageReference Include="Microsoft.Azure.Management.RecoveryServices.SiteRecovery" Version="1.2.0-preview" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Include="Az.RecoveryServices.SiteRecovery.psd1">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">
       <DesignTime>true</DesignTime>
@@ -62,4 +56,4 @@
     <ProjectReference Include="..\Commands.RecoveryServices\Commands.RecoveryServices.Netcore.csproj" />
   </ItemGroup>
 
-</Project>
+</Project>

src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Az.RecoveryServices.psd1

@@ -1,5 +1,5 @@
 #
-# Module manifest for module 'AzureRM.RecoveryServices'
+# Module manifest for module 'Az.RecoveryServices'
 #
 # Generated by: Microsoft Corporation
 #
@@ -54,7 +54,8 @@ DotNetFrameworkVersion = '4.7.2'
 RequiredModules = @(@{ModuleName = 'Az.Profile'; ModuleVersion = '0.3.0'; })
 
 # Assemblies that must be loaded prior to importing this module
-RequiredAssemblies = '.\Microsoft.Azure.Commands.RecoveryServices.Backup.Models.dll', 
+RequiredAssemblies = '.\AutoMapper.dll', 
+    '.\Microsoft.Azure.Commands.RecoveryServices.Backup.Models.dll', 
     '.\Microsoft.Azure.Management.RecoveryServices.Backup.dll', 
     '.\Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers.dll', 
     '.\Microsoft.Azure.Commands.RecoveryServices.Backup.Logger.dll', 
@@ -75,7 +76,7 @@ FormatsToProcess = '.\Microsoft.Azure.Commands.RecoveryServices.Backup.format.ps
 # Modules to import as nested modules of the module specified in RootModule/ModuleToProcess
 NestedModules = @('.\Microsoft.Azure.Commands.RecoveryServices.ARM.dll',
     '.\Microsoft.Azure.Commands.RecoveryServices.Backup.dll',
-	'.\Microsoft.Azure.Commands.RecoveryServices.SiteRecovery.dll')
+    '.\Microsoft.Azure.Commands.RecoveryServices.SiteRecovery.dll')
 
 # 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.
 FunctionsToExport = @()
@@ -171,13 +172,49 @@ CmdletsToExport = 'Get-AzRecoveryServicesBackupProperty',
     'Restore-AzRecoveryServicesBackupItem', 
     'Unregister-AzRecoveryServicesBackupManagementServer', 
     'Get-AzRecoveryServicesBackupRPMountScript', 
-    'Disable-AzRecoveryServicesBackupRPMountScript'
+    'Disable-AzRecoveryServicesBackupRPMountScript', 
+    'Get-AzRecoveryServicesBackupStatus'
 
 # Variables to export from this module
 # VariablesToExport = @()
 
 # 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.
-AliasesToExport = 'Get-AzRecoveryServicesBackupProperties'
+AliasesToExport = 'Get-AzRecoveryServicesBackupProperties', 
+    'Edit-ASRRP', 'Edit-ASRRecoveryPlan', 'Get-ASRAlertSetting', 
+    'Get-ASREvent', 'Get-ASRFabric', 'Get-ASRJob', 'Get-ASRNetwork', 
+    'Get-ASRNetworkMapping', 'Get-ASRNotificationSetting', 
+    'Get-ASRPolicy', 'Get-ASRProtectableItem', 
+    'Get-ASRProtectionContainer', 'Get-ASRProtectionContainerMapping', 
+    'Get-ASRRP', 'Get-ASRRecoveryPlan', 'Get-ASRRecoveryPoint', 
+    'Get-ASRReplicationProtectedItem', 'Get-ASRServicesProvider', 
+    'Get-ASRStorageClassification', 
+    'Get-ASRStorageClassificationMapping', 'Set-ASRVaultContext', 
+    'Set-ASRVaultSettings', 'Get-ASRvCenter', 
+    'Get-AzRecoveryServicesAsrNotificationSetting', 
+    'Get-AzRecoveryServicesAsrVaultSettings', 'New-ASRFabric', 
+    'New-ASRNetworkMapping', 'New-ASRPolicy', 'New-ASRProtectableItem', 
+    'New-ASRProtectionContainerMapping', 'New-ASRRP', 
+    'New-ASRRecoveryPlan', 'New-ASRReplicationProtectedItem', 
+    'New-ASRStorageClassificationMapping', 'New-ASRvCenter', 
+    'Remove-ASRFabric', 'Remove-ASRNetworkMapping', 'Remove-ASRPolicy', 
+    'Remove-ASRProtectionContainerMapping', 'Remove-ASRRP', 
+    'Remove-ASRRecoveryPlan', 'Remove-ASRReplicationProtectedItem', 
+    'Remove-ASRServicesProvider', 
+    'Remove-ASRStorageClassificationMapping', 'Remove-ASRvCenter', 
+    'Restart-ASRJob', 'Resume-ASRJob', 'Set-ASRAlertSetting', 
+    'Set-ASRNotificationSetting', 'Set-ASRReplicationProtectedItem', 
+    'Set-AzRecoveryServicesAsrNotificationSetting', 
+    'Set-AzRecoveryServicesAsrVaultSettings', 
+    'Start-ASRApplyRecoveryPoint', 'Start-ASRCommitFailover', 
+    'Start-ASRCommitFailoverJob', 'Start-ASRFO', 'Start-ASRPFO', 
+    'Start-ASRPlannedFailoverJob', 'Start-ASRResyncJob', 
+    'Start-ASRResynchronizeReplicationJob', 
+    'Start-ASRSwitchProcessServerJob', 'Start-ASRTFO', 
+    'Start-ASRTFOCleanupJob', 'Start-ASRTestFailoverCleanupJob', 
+    'Start-ASRTestFailoverJob', 'Start-ASRUnplannedFailoverJob', 
+    'Stop-ASRJob', 'Update-ASRMobilityService', 'Update-ASRPolicy', 
+    'Update-ASRProtectionDirection', 'Update-ASRRecoveryPlan', 
+    'Update-ASRServicesProvider', 'Update-ASRvCenter'
 
 # DSC resources to export from this module
 # DscResourcesToExport = @()

tools/StaticAnalysis/Program.cs

@@ -143,7 +143,7 @@ public static void Main(string[] args)
             }
             catch(Exception ex)
             {
-                analysisLogger.WriteError(ex.ToString());
+                analysisLogger?.WriteError(ex.ToString());
                 throw ex;
             }
             finally

tools/StaticAnalysis/StaticAnalysis.Netcore.csproj

@@ -3,19 +3,20 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
+    <LangVersion>latest</LangVersion>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <WarningsAsErrors />
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <OutputPath>$(ProjectDir)..\..\src\Package\StaticAnalysis\</OutputPath>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DefineConstants>TRACE;DEBUG;NETSTANDARD</DefineConstants>
-    <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <DefineConstants>TRACE;NETSTANDARD</DefineConstants>
-    <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>

tools/Tools.Common/Loggers/AnalysisLogger.cs

@@ -190,7 +190,7 @@ public void CheckForIssues(int maxSeverity)
             if (hasErrors)
             {
                 throw new InvalidOperationException(string.Format("One or more errors occurred in validation. " +
-                                                                  "See the analysis repots at {0} for details",
+                                                                  "See the analysis reports at {0} for details",
                     _baseDirectory));
             }
         }