Fixed project references post-rename. Normalized all asset loading.

secti6n · Dec 21, 2018 · 2779026 · 2779026
1 parent 454b6fa
commit 2779026
Show file tree

Hide file tree

Showing 111 changed files with 116 additions and 2,381 deletions.
diff --git a/build.proj b/build.proj
@@ -221,7 +221,7 @@
     <Exec Command="dotnet --version" />
     <Exec Command="dotnet new sln -n Azure.PowerShell --force" />
     <ItemGroup>
-      <ModuleCsprojFiles Include="$(LibraryRoot)src/ResourceManager/**/*.csproj" Exclude="$(LibraryRoot)src/ResourceManager/**/*.Test.Netcore.csproj" />
+      <ModuleCsprojFiles Include="$(LibraryRoot)src/ResourceManager/**/*.csproj" Exclude="$(LibraryRoot)src/ResourceManager/**/*.Test.csproj" />
     </ItemGroup>
     <Exec Command="dotnet sln Azure.PowerShell.sln add @(ModuleCsprojFiles->'%(FullPath)', ' ')" />
     <Exec Command="dotnet sln Azure.PowerShell.sln add $(LibraryRoot)tools/Tools.Common/Tools.Common.Netcore.csproj $(LibraryRoot)tools/StaticAnalysis/StaticAnalysis.Netcore.csproj" />

diff --git a/src/Az.Shared.props b/src/Az.Shared.props
@@ -6,7 +6,7 @@
     <LegacyAssemblyPrefix>Microsoft.Azure.Commands.</LegacyAssemblyPrefix>
   </PropertyGroup>
 
-  <!-- CsProj -->
+  <!-- Build -->
   <PropertyGroup>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

diff --git a/src/Az.Test.props b/src/Az.Test.props
@@ -9,7 +9,7 @@
     <AzTestAssemblySuffix>.Test</AzTestAssemblySuffix>
   </PropertyGroup>
 
-  <!-- CsProj -->
+  <!-- Build -->
   <PropertyGroup>
     <TargetFrameworks>netcoreapp2.1;netcoreapp2.0</TargetFrameworks>
     <AssemblyName>$(AzAssemblyPrefix)$(PsModuleName)$(AzTestAssemblySuffix)</AssemblyName>

diff --git a/src/Az.props b/src/Az.props
@@ -4,7 +4,7 @@
   <Import Project="$(RepoTools)Common.Netcore.Dependencies.targets" />
   <Import Project="$(MSBuildThisFileDirectory)Az.Shared.props" />
 
-  <!-- CsProj -->
+  <!-- Build -->
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>$(AzAssemblyPrefix)$(PsModuleName)</AssemblyName>
@@ -26,4 +26,27 @@
     <DefineConstants>TRACE;RELEASE;NETSTANDARD;SIGN</DefineConstants>
   </PropertyGroup>
 
+  <!-- Resources -->
+  <ItemGroup>
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>true</DesignTime>
+      <AutoGen>true</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
+  <!-- Assets -->
+  <ItemGroup>
+    <None Update="Az.$(PsModuleName).psd1" CopyToOutputDirectory="PreserveNewest" />
+    <None Update="help\*.md" CopyToOutputDirectory="PreserveNewest" />
+    <None Update="*.ps1xml" CopyToOutputDirectory="PreserveNewest" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/ResourceManager/Advisor/Commands.Advisor.Test/Advisor.Test.csproj b/src/ResourceManager/Advisor/Commands.Advisor.Test/Advisor.Test.csproj
@@ -14,9 +14,9 @@
     <PackageReference Include="Microsoft.Azure.Management.Advisor" Version="0.9.5-preview" />
   </ItemGroup>
 
-  <ItemGroup>
+  <!-- <ItemGroup>
     <ProjectReference Include="..\Commands.Advisor\Commands.Advisor.Netcore.csproj" />
-  </ItemGroup>
+  </ItemGroup> -->
 
   <ItemGroup>
     <None Update="SessionRecords\**\*.json">

diff --git a/src/ResourceManager/Advisor/Commands.Advisor/Advisor.csproj b/src/ResourceManager/Advisor/Commands.Advisor/Advisor.csproj
@@ -15,20 +15,4 @@
     <PackageReference Include="Microsoft.Azure.Management.Advisor" Version="0.9.5-preview" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Include="Az.Advisor.psd1">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Update="Microsoft.Azure.Commands.Advisor.format.ps1xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Content Include="help\**\*" CopyToOutputDirectory="PreserveNewest" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/ResourceManager/Aks/Commands.Aks.Test/Aks.Test.csproj b/src/ResourceManager/Aks/Commands.Aks.Test/Aks.Test.csproj
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Commands.Aks\Commands.Aks.Netcore.csproj" />
+    <ProjectReference Include="..\Commands.Aks\Aks.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/ResourceManager/Aks/Commands.Aks/Aks.csproj b/src/ResourceManager/Aks/Commands.Aks/Aks.csproj
@@ -15,38 +15,4 @@
     <PackageReference Include="AutoMapper" Version="6.2.2" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Include="Az.Aks.psd1">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Update="Properties\Resources.Designer.cs">
-      <DesignTime>true</DesignTime>
-      <AutoGen>true</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Update="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Update="Microsoft.Azure.Commands.Aks.Cmdlets.format.ps1xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="Microsoft.Azure.Commands.Aks.Cmdlets.Types.ps1xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Content Include="help\**\*" CopyToOutputDirectory="PreserveNewest" />
-  </ItemGroup>
-
 </Project>
diff --git a/...er/AnalysisServices/Commands.AnalysisServices.Dataplane/AnalysisServices.Dataplane.csproj b/...er/AnalysisServices/Commands.AnalysisServices.Dataplane/AnalysisServices.Dataplane.csproj
@@ -11,23 +11,4 @@
     <RootNamespace>$(LegacyAssemblyPrefix)$(PsModuleName).Dataplane</RootNamespace>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Update="Properties\Resources.Designer.cs">
-      <DesignTime>true</DesignTime>
-      <AutoGen>true</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Update="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Content Include="help\**\*" CopyToOutputDirectory="PreserveNewest" />
-  </ItemGroup>
-
 </Project>
diff --git a/...ourceManager/AnalysisServices/Commands.AnalysisServices.Test/AnalysisServices.Test.csproj b/...ourceManager/AnalysisServices/Commands.AnalysisServices.Test/AnalysisServices.Test.csproj
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Commands.AnalysisServices.Dataplane\Commands.AnalysisServices.Dataplane.Netcore.csproj" />
+    <ProjectReference Include="..\Commands.AnalysisServices.Dataplane\AnalysisServices.Dataplane.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/AnalysisServices.csproj b/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/AnalysisServices.csproj
@@ -16,29 +16,4 @@
     <PackageReference Include="System.Security.Permissions" Version="4.5.0" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Include="Az.AnalysisServices.psd1">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Update="Properties\Resources.Designer.cs">
-      <DesignTime>true</DesignTime>
-      <AutoGen>true</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Update="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Content Include="help\**\*" CopyToOutputDirectory="PreserveNewest" />
-  </ItemGroup>
-
 </Project>
diff --git a/...anagement/Commands.ApiManagement.ServiceManagement/ApiManagement.ServiceManagement.csproj b/...anagement/Commands.ApiManagement.ServiceManagement/ApiManagement.ServiceManagement.csproj
@@ -16,29 +16,4 @@
     <PackageReference Include="Microsoft.Azure.Management.ApiManagement" Version="4.0.6-preview" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Include="..\Commands.ApiManagement\Az.ApiManagement.psd1" Link="Az.ApiManagement.psd1">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Update="Properties\Resources.Designer.cs">
-      <DesignTime>true</DesignTime>
-      <AutoGen>true</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Update="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Content Include="help\**\*" CopyToOutputDirectory="PreserveNewest" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/ResourceManager/ApiManagement/Commands.ApiManagement/ApiManagement.csproj b/src/ResourceManager/ApiManagement/Commands.ApiManagement/ApiManagement.csproj
@@ -17,31 +17,6 @@
     <PackageReference Include="WindowsAzure.Storage" Version="9.3.0" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Include="Az.ApiManagement.psd1">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Update="Properties\Resources.Designer.cs">
-      <DesignTime>true</DesignTime>
-      <AutoGen>true</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Update="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Content Include="help\**\*" CopyToOutputDirectory="PreserveNewest" />
-  </ItemGroup>
-
   <ItemGroup>
     <Compile Include="$(StorageToolsPath)Adapters\WindowsAzure.Storage.8\AzureStorageContext.cs" />
     <Compile Include="$(StorageToolsPath)Adapters\WindowsAzure.Storage.8\AzureContextAdapterExtensions.cs" />

diff --git a/...sourceManager/ApplicationInsights/Commands.ApplicationInsights/ApplicationInsights.csproj b/...sourceManager/ApplicationInsights/Commands.ApplicationInsights/ApplicationInsights.csproj
@@ -14,35 +14,4 @@
     <PackageReference Include="Microsoft.Azure.Management.ApplicationInsights" Version="0.2.0-preview" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Include="Az.ApplicationInsights.psd1">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Update="Properties\Resources.Designer.cs">
-      <DesignTime>true</DesignTime>
-      <AutoGen>true</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Update="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Update="Microsoft.Azure.Commands.ApplicationInsights.format.ps1xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Content Include="help\**\*" CopyToOutputDirectory="PreserveNewest" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/ResourceManager/Automation/Commands.Automation.Test/Automation.Test.csproj b/src/ResourceManager/Automation/Commands.Automation.Test/Automation.Test.csproj
@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Commands.Automation\Commands.Automation.Netcore.csproj" />
+    <ProjectReference Include="..\Commands.Automation\Automation.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/ResourceManager/Automation/Commands.Automation/Automation.csproj b/src/ResourceManager/Automation/Commands.Automation/Automation.csproj
@@ -15,35 +15,4 @@
     <PackageReference Include="System.Security.Permissions" Version="4.5.0" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Include="Az.Automation.psd1">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Update="Properties\Resources.Designer.cs">
-      <DesignTime>true</DesignTime>
-      <AutoGen>true</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Update="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Content Include="help\**\*" CopyToOutputDirectory="PreserveNewest" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Update="AzureRM.Automation.format.ps1xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
 </Project>
diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/Batch.Test.csproj b/src/ResourceManager/AzureBatch/Commands.Batch.Test/Batch.Test.csproj
@@ -21,7 +21,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Commands.Batch\Commands.Batch.Netcore.csproj" />
+    <ProjectReference Include="..\Commands.Batch\Batch.csproj" />
   </ItemGroup>
 
   <ItemGroup>