Skip to content

Commit 56d3da4

Browse files
cormacpaynecormacpayne
authored
Merge pull request Azure#5063 from twitchax/preview
Netcore fixes.
2 parents e1dbc15 + 15b94d4 commit 56d3da4

25 files changed

+229
-139
lines changed

‎.dockerignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33

44
# Include the build.
55
!src/Package/Release/ResourceManager/**/*
6-
!src/Package/Debug/ResourceManager/**/*
6+
!src/Package/Debug/ResourceManager/**/*
7+
!tools/InstallationTests/NetcoreTests/**/*

‎.travis.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ services:
1313
before_install:
1414
- sudo apt-get update
1515
- sudo apt-get install docker-ce
16+
- curl https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -
17+
- curl https://packages.microsoft.com/config/ubuntu/14.04/prod.list | sudo tee /etc/apt/sources.list.d/microsoft.list
18+
- sudo apt-get update
19+
- sudo apt-get install -y powershell
20+
- sudo pwsh -NonInteractive -NoLogo -NoProfile -Command "Install-Module platyPS -Force -Confirm:\$false -Scope CurrentUser"
1621

1722
script:
1823
- dotnet msbuild build.proj /t:BuildNetcore /p:Configuration=$CONFIG

‎Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ FROM microsoft/powershell
22

33
ARG CONFIG=Release
44

5-
COPY src/Package/${CONFIG}/ResourceManager /usr/local/share/powershell/Modules
5+
COPY src/Package/${CONFIG}/ResourceManager/AzureResourceManager /usr/local/share/powershell/Modules
6+
COPY tools/InstallationTests/NetcoreTests /azpstests

‎build.proj

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@
149149
<NuGetLocalBuildTaskPackages>-PackagesDirectory $(LibraryToolsFolder)\BuildPackagesTask\packages</NuGetLocalBuildTaskPackages>
150150

151151
<PowerShellCommand Condition=" '$(PowerShellCommand)' == '' ">C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe</PowerShellCommand>
152+
<PowerShellCoreCommand Condition=" '$(PowerShellCoreCommand)' == '' ">pwsh</PowerShellCoreCommand>
152153
</PropertyGroup>
153154

154155
<!--
@@ -271,54 +272,54 @@
271272

272273
<!-- Delete powershell runtime files -->
273274
<ItemGroup>
274-
<RedundantDlls Include="$(PackageDirectory)\**\netcoreapp2.0\publish\Microsoft.Powershell.*.dll" />
275-
<RedundantDlls Include="$(PackageDirectory)\**\netcoreapp2.0\publish\System*.dll"
276-
Exclude="$(PackageDirectory)\**\netcoreapp2.0\publish\System.Security.Cryptography.ProtectedData.dll" />
277-
<RedundantDlls Include="$(PackageDirectory)\**\netcoreapp2.0\publish\Microsoft.VisualBasic.dll" />
278-
<RedundantDlls Include="$(PackageDirectory)\**\netcoreapp2.0\publish\Microsoft.CSharp.dll" />
279-
<RedundantDlls Include="$(PackageDirectory)\**\netcoreapp2.0\publish\Microsoft.CodeAnalysis.dll" />
280-
<RedundantDlls Include="$(PackageDirectory)\**\netcoreapp2.0\publish\Microsoft.CodeAnalysis.CSharp.dll" />
275+
<RedundantDlls Include="$(PackageDirectory)\**\publish\Microsoft.Powershell.*.dll" />
276+
<RedundantDlls Include="$(PackageDirectory)\**\publish\System*.dll"
277+
Exclude="$(PackageDirectory)\**\publish\System.Security.Cryptography.ProtectedData.dll" />
278+
<RedundantDlls Include="$(PackageDirectory)\**\publish\Microsoft.VisualBasic.dll" />
279+
<RedundantDlls Include="$(PackageDirectory)\**\publish\Microsoft.CSharp.dll" />
280+
<RedundantDlls Include="$(PackageDirectory)\**\publish\Microsoft.CodeAnalysis.dll" />
281+
<RedundantDlls Include="$(PackageDirectory)\**\publish\Microsoft.CodeAnalysis.CSharp.dll" />
281282
</ItemGroup>
282283

283284
<Delete Files="@(RedundantDlls->'%(FullPath)')"/>
284285

285-
<!-- Copy content of the publish folder one folders up -->
286+
<!-- Copy content of the publish folder one folder up. -->
286287
<ItemGroup>
287-
<PackageContent Include="$(PackageDirectory)\**\netcoreapp2.0\publish\*.*" />
288+
<PackageContent Include="$(PackageDirectory)\**\publish\*.*" />
288289
<SourceFile Include="@(PackageContent)">
289290
<DestinationFolder>$([System.IO.Path]::Combine('%(RelativeDir)', '..', '%(FileName)%(Extension)'))</DestinationFolder>
290291
</SourceFile>
291292
</ItemGroup>
292293

293294
<Copy SourceFiles="@(SourceFile->'%(FullPath)')" DestinationFiles="@(SourceFile->'%(DestinationFolder)')" SkipUnchangedFiles="true"/>
294295

295-
<!-- Move PSD1 files one folders up -->
296-
<ItemGroup>
297-
<psdFiles Include="$(PackageDirectory)\**\netcoreapp2.0\*.psd1" />
298-
<psdFilesTarget Include="@(psdFiles)">
299-
<DestinationFolder>$([System.IO.Path]::Combine('%(RelativeDir)', '..', '%(FileName)%(Extension)'))</DestinationFolder>
300-
</psdFilesTarget>
301-
</ItemGroup>
302-
303-
<Move SourceFiles="@(psdFilesTarget->'%(FullPath)')" DestinationFiles="@(psdFilesTarget->'%(DestinationFolder)')"/>
304-
305296
<!-- Delete build artifacts -->
306297
<ItemGroup>
307-
<GetAllFiles Include="$(PackageDirectory)\**\netcoreapp2.0\publish\*.*" />
298+
<GetAllFiles Include="$(PackageDirectory)\**\publish\*.*" />
308299
<Artifacts Include="@(GetAllFiles->'%(RootDir)%(Directory)'->Distinct())" />
309300
</ItemGroup>
310301

311302
<RemoveDir Directories="%(Artifacts.Identity)" ContinueOnError="true" />
312303

313304
<ItemGroup>
314-
<ExtraPsdFiles Include="$(PackageDirectory)\$(Configuration)\ResourceManager\AzureRM.Resources.Netcore\AzureRM.Tags.Netcore.psd1" />
315-
<ExtraPsdFiles Include="$(PackageDirectory)\$(Configuration)\ResourceManager\AzureRM.Websites.Netcore\AzureRM.Resources.Netcore.psd1" />
316-
<ExtraPsdFiles Include="$(PackageDirectory)\$(Configuration)\ResourceManager\AzureRM.Websites.Netcore\AzureRM.Tags.Netcore.psd1" />
317-
<ExtraPsdFiles Include="$(PackageDirectory)\$(Configuration)\ResourceManager\AzureRM.Network.Netcore\AzureRM.Resources.Netcore.psd1" />
318-
<ExtraPsdFiles Include="$(PackageDirectory)\$(Configuration)\ResourceManager\AzureRM.Network.Netcore\AzureRM.Tags.Netcore.psd1" />
305+
<ExtraPsdFiles Include="$(PackageDirectory)\$(Configuration)\ResourceManager\AzureResourceManager\AzureRM.Resources.Netcore\AzureRM.Tags.Netcore.psd1" />
306+
<ExtraPsdFiles Include="$(PackageDirectory)\$(Configuration)\ResourceManager\AzureResourceManager\AzureRM.Websites.Netcore\AzureRM.Resources.Netcore.psd1" />
307+
<ExtraPsdFiles Include="$(PackageDirectory)\$(Configuration)\ResourceManager\AzureResourceManager\AzureRM.Websites.Netcore\AzureRM.Tags.Netcore.psd1" />
308+
<ExtraPsdFiles Include="$(PackageDirectory)\$(Configuration)\ResourceManager\AzureResourceManager\AzureRM.Network.Netcore\AzureRM.Resources.Netcore.psd1" />
309+
<ExtraPsdFiles Include="$(PackageDirectory)\$(Configuration)\ResourceManager\AzureResourceManager\AzureRM.Network.Netcore\AzureRM.Tags.Netcore.psd1" />
319310
</ItemGroup>
320311

321312
<Delete Files="@(ExtraPsdFiles->'%(FullPath)')"/>
313+
314+
<!-- Update module manifests. -->
315+
<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'"/>
316+
317+
<!-- Generate the help. -->
318+
<Exec Command="&quot;$(PowerShellCoreCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\GenerateHelp.ps1 -GenerateMamlHelp -BuildConfig $(Configuration) &quot;" ContinueOnError="true" Condition=" '$(SkipHelp)' == 'false' and '$(Latest)' == 'true'"/>
319+
320+
<!-- Cleanup extraneous files. -->
321+
<Exec Command="&quot;$(PowerShellCoreCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\CleanupBuild.ps1 -BuildConfig $(Configuration) &quot;" />
322+
322323
<CallTarget Targets="CodeSignBinaries" Condition=" '$(CodeSign)' == 'true' " />
323324
</Target>
324325

@@ -368,7 +369,6 @@
368369
<Output TaskParameter="Path" PropertyName="WindowsSdkPath"/>
369370
</GetFrameworkSdkPath>
370371

371-
372372
<Copy SourceFiles="$(LibraryRoot)tools\AzureRM.Netcore\AzureRM.Netcore.psd1"
373373
DestinationFolder="$(LibrarySourceFolder)\Package\$(Configuration)" Condition= " '$(NetCore)' == 'true' "/>
374374

‎src/ResourceManager/Compute/AzureRM.Compute.Netcore.psd1

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Script module or binary module file associated with this manifest.
12-
# RootModule = ''
12+
RootModule = '.\AzureRM.Compute.Netcore.psm1'
1313

1414
# Version number of this module.
1515
ModuleVersion = '0.10.0'
@@ -54,29 +54,29 @@ PowerShellVersion = '5.1'
5454
RequiredModules = @(@{ModuleName = 'AzureRM.Profile.Netcore'; ModuleVersion = '0.10.0'; })
5555

5656
# Assemblies that must be loaded prior to importing this module
57-
RequiredAssemblies = 'netcoreapp2.0\AutoMapper.dll',
58-
'netcoreapp2.0\Microsoft.Azure.Management.Compute.dll',
59-
'netcoreapp2.0\Microsoft.Azure.Management.KeyVault.dll',
60-
'netcoreapp2.0\Microsoft.Azure.Management.Storage.dll',
61-
'netcoreapp2.0\Microsoft.Data.Edm.dll',
62-
'netcoreapp2.0\Microsoft.Data.OData.dll',
63-
'netcoreapp2.0\Microsoft.WindowsAzure.Storage.dll',
64-
'netcoreapp2.0\System.Spatial.dll',
65-
'netcoreapp2.0\Microsoft.Azure.Commands.Common.Strategies.dll'
57+
RequiredAssemblies = '.\AutoMapper.dll',
58+
'.\Microsoft.Azure.Commands.Common.Strategies.dll',
59+
'.\Microsoft.Azure.Management.Compute.dll',
60+
'.\Microsoft.Azure.Management.KeyVault.dll',
61+
'.\Microsoft.Azure.Management.Storage.dll',
62+
'.\Microsoft.Data.Edm.dll',
63+
'.\Microsoft.Data.OData.dll',
64+
'.\Microsoft.WindowsAzure.Storage.dll',
65+
'.\System.Spatial.dll'
6666

6767
# Script files (.ps1) that are run in the caller's environment prior to importing this module.
6868
# ScriptsToProcess = @()
6969

7070
# Type files (.ps1xml) to be loaded when importing this module
71-
TypesToProcess = 'netcoreapp2.0\Microsoft.Azure.Commands.Compute.Types.ps1xml'
71+
TypesToProcess = '.\Microsoft.Azure.Commands.Compute.Types.ps1xml'
7272

7373
# Format files (.ps1xml) to be loaded when importing this module
74-
FormatsToProcess = 'netcoreapp2.0\Microsoft.Azure.Commands.Compute.format.ps1xml',
75-
'netcoreapp2.0\Microsoft.Azure.Commands.Compute.format.generated.ps1xml',
76-
'netcoreapp2.0\Generated\Microsoft.Azure.Commands.Compute.Automation.format.generated.ps1xml'
74+
FormatsToProcess = '.\Microsoft.Azure.Commands.Compute.format.ps1xml',
75+
'.\Microsoft.Azure.Commands.Compute.format.generated.ps1xml',
76+
'.\Generated\Microsoft.Azure.Commands.Compute.Automation.format.generated.ps1xml'
7777

7878
# Modules to import as nested modules of the module specified in RootModule/ModuleToProcess
79-
NestedModules = @('netcoreapp2.0\Microsoft.Azure.Commands.Compute.dll')
79+
NestedModules = @('.\Microsoft.Azure.Commands.Compute.dll')
8080

8181
# 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.
8282
FunctionsToExport = @()

‎src/ResourceManager/Compute/Commands.Compute/Commands.Compute.Netcore.csproj

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,17 @@
99
<RootNamespace>Microsoft.Azure.Commands.Compute</RootNamespace>
1010
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
1111
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
12+
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
1213
</PropertyGroup>
1314

1415
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
1516
<DefineConstants>TRACE;DEBUG;NETSTANDARD</DefineConstants>
16-
<OutputPath>..\..\..\Package\Debug\ResourceManager\AzureRM.Compute.Netcore\</OutputPath>
17+
<OutputPath>..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.Compute.Netcore\</OutputPath>
1718
<DelaySign>false</DelaySign>
1819
</PropertyGroup>
1920

2021
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
21-
<OutputPath>..\..\..\Package\Release\ResourceManager\AzureRM.Compute.Netcore\</OutputPath>
22+
<OutputPath>..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.Compute.Netcore\</OutputPath>
2223
<DocumentationFile></DocumentationFile>
2324
<SignAssembly>True</SignAssembly>
2425
<DelaySign>True</DelaySign>
@@ -183,4 +184,8 @@
183184
<Folder Include="VhdManagement\Model\Persistance\" />
184185
</ItemGroup>
185186

187+
<ItemGroup>
188+
<Content Include="help\**\*" CopyToOutputDirectory="PreserveNewest" />
189+
</ItemGroup>
190+
186191
</Project>

‎src/ResourceManager/KeyVault/AzureRM.KeyVault.Netcore.psd1

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
@{
1010

1111
# Script module or binary module file associated with this manifest.
12-
# RootModule = ''
12+
RootModule = '.\AzureRM.KeyVault.Netcore.psm1'
1313

1414
# Version number of this module.
15-
ModuleVersion = '0.9.6'
15+
ModuleVersion = '0.10.0'
1616

1717
# Supported PSEditions
1818
CompatiblePSEditions = 'Core'
@@ -51,12 +51,12 @@ PowerShellVersion = '5.1'
5151
# ProcessorArchitecture = ''
5252

5353
# Modules that must be imported into the global environment prior to importing this module
54-
RequiredModules = @(@{ModuleName = 'AzureRM.Profile.Netcore'; ModuleVersion = '0.9.6'; })
54+
RequiredModules = @(@{ModuleName = 'AzureRM.Profile.Netcore'; ModuleVersion = '0.10.0'; })
5555

5656
# Assemblies that must be loaded prior to importing this module
57-
RequiredAssemblies = 'netcoreapp2.0\Microsoft.Azure.KeyVault.dll',
58-
'netcoreapp2.0\Microsoft.Azure.KeyVault.WebKey.dll',
59-
'netcoreapp2.0\Microsoft.Azure.Management.KeyVault.dll'
57+
RequiredAssemblies = '.\Microsoft.Azure.KeyVault.dll',
58+
'.\Microsoft.Azure.KeyVault.WebKey.dll',
59+
'.\Microsoft.Azure.Management.KeyVault.dll'
6060

6161
# Script files (.ps1) that are run in the caller's environment prior to importing this module.
6262
# ScriptsToProcess = @()
@@ -65,10 +65,10 @@ RequiredAssemblies = 'netcoreapp2.0\Microsoft.Azure.KeyVault.dll',
6565
# TypesToProcess = @()
6666

6767
# Format files (.ps1xml) to be loaded when importing this module
68-
FormatsToProcess = 'netcoreapp2.0\Microsoft.Azure.Commands.KeyVault.format.ps1xml'
68+
FormatsToProcess = '.\Microsoft.Azure.Commands.KeyVault.format.ps1xml'
6969

7070
# Modules to import as nested modules of the module specified in RootModule/ModuleToProcess
71-
NestedModules = @('netcoreapp2.0\Microsoft.Azure.Commands.KeyVault.dll')
71+
NestedModules = @('.\Microsoft.Azure.Commands.KeyVault.dll')
7272

7373
# 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.
7474
FunctionsToExport = @()
@@ -139,7 +139,7 @@ PrivateData = @{
139139
# A URL to the license for this module.
140140
LicenseUri = 'https://aka.ms/azps-license'
141141

142-
# A URL to the main website focd .netcoreapp2.0\..this project.
142+
# A URL to the main website for this project.
143143
ProjectUri = 'https://github.com/Azure/azure-powershell'
144144

145145
# A URL to an icon representing this module.

‎src/ResourceManager/KeyVault/Commands.KeyVault/Commands.KeyVault.Netcore.csproj

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,17 @@
1010
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
1111
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1212
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
13+
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
1314
</PropertyGroup>
1415

1516
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
1617
<DefineConstants>TRACE;DEBUG;NETSTANDARD</DefineConstants>
17-
<OutputPath>..\..\..\Package\Debug\ResourceManager\AzureRM.KeyVault.Netcore\</OutputPath>
18+
<OutputPath>..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.KeyVault.Netcore\</OutputPath>
1819
<DelaySign>false</DelaySign>
1920
</PropertyGroup>
2021

2122
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
22-
<OutputPath>..\..\..\Package\Release\ResourceManager\AzureRM.KeyVault.Netcore\</OutputPath>
23+
<OutputPath>..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.KeyVault.Netcore\</OutputPath>
2324
<DocumentationFile></DocumentationFile>
2425
<SignAssembly>True</SignAssembly>
2526
<DelaySign>True</DelaySign>
@@ -73,4 +74,8 @@
7374
</None>
7475
</ItemGroup>
7576

77+
<ItemGroup>
78+
<Content Include="help\**\*" CopyToOutputDirectory="PreserveNewest" />
79+
</ItemGroup>
80+
7681
</Project>

‎src/ResourceManager/Network/AzureRM.Network.Netcore.psd1

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Script module or binary module file associated with this manifest.
12-
# RootModule = ''
12+
RootModule = '.\AzureRM.Network.Netcore.psm1'
1313

1414
# Version number of this module.
1515
ModuleVersion = '0.10.0'
@@ -54,20 +54,20 @@ PowerShellVersion = '5.1'
5454
RequiredModules = @(@{ModuleName = 'AzureRM.Profile.Netcore'; ModuleVersion = '0.10.0'; })
5555

5656
# Assemblies that must be loaded prior to importing this module
57-
RequiredAssemblies = 'netcoreapp2.0\AutoMapper.dll',
58-
'netcoreapp2.0\Microsoft.Azure.Management.Network.dll'
57+
RequiredAssemblies = '.\AutoMapper.dll',
58+
'.\Microsoft.Azure.Management.Network.dll'
5959

6060
# Script files (.ps1) that are run in the caller's environment prior to importing this module.
61-
ScriptsToProcess = @('netcoreapp2.0\AzureRmNetworkStartup.ps1')
61+
# ScriptsToProcess = @()
6262

6363
# Type files (.ps1xml) to be loaded when importing this module
6464
# TypesToProcess = @()
6565

6666
# Format files (.ps1xml) to be loaded when importing this module
67-
FormatsToProcess = 'netcoreapp2.0\Microsoft.Azure.Commands.Network.format.ps1xml'
67+
FormatsToProcess = '.\Microsoft.Azure.Commands.Network.format.ps1xml'
6868

6969
# Modules to import as nested modules of the module specified in RootModule/ModuleToProcess
70-
NestedModules = @('netcoreapp2.0\Microsoft.Azure.Commands.Network.dll')
70+
NestedModules = @('.\Microsoft.Azure.Commands.Network.dll')
7171

7272
# 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.
7373
FunctionsToExport = @()

‎src/ResourceManager/Network/Commands.Network/Commands.Network.Netcore.csproj

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,17 @@
99
<RootNamespace>Microsoft.Azure.Commands.Network</RootNamespace>
1010
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
1111
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
12+
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
1213
</PropertyGroup>
1314

1415
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
1516
<DefineConstants>TRACE;DEBUG;NETSTANDARD</DefineConstants>
16-
<OutputPath>..\..\..\Package\Debug\ResourceManager\AzureRM.Network.Netcore\</OutputPath>
17+
<OutputPath>..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.Network.Netcore\</OutputPath>
1718
<DelaySign>false</DelaySign>
1819
</PropertyGroup>
1920

2021
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
21-
<OutputPath>..\..\..\Package\Release\ResourceManager\AzureRM.Network.Netcore\</OutputPath>
22+
<OutputPath>..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.Network.Netcore\</OutputPath>
2223
<DocumentationFile></DocumentationFile>
2324
<SignAssembly>True</SignAssembly>
2425
<DelaySign>True</DelaySign>
@@ -79,4 +80,8 @@
7980
</None>
8081
</ItemGroup>
8182

83+
<ItemGroup>
84+
<Content Include="help\**\*" CopyToOutputDirectory="PreserveNewest" />
85+
</ItemGroup>
86+
8287
</Project>

‎src/ResourceManager/Network/Stack/Commands.Network/Commands.Network.Netcore.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212

1313
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
1414
<DefineConstants>TRACE;DEBUG;NETSTANDARD</DefineConstants>
15-
<OutputPath>..\..\..\Package\Debug\ResourceManager\AzureRM.Network.Netcore\</OutputPath>
15+
<OutputPath>..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.Network.Netcore\</OutputPath>
1616
</PropertyGroup>
1717

1818
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
19-
<OutputPath>..\..\..\Package\Release\ResourceManager\AzureRM.Network.Netcore\</OutputPath>
19+
<OutputPath>..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.Network.Netcore\</OutputPath>
2020
<DocumentationFile></DocumentationFile>
2121
<SignAssembly>True</SignAssembly>
2222
<DelaySign>True</DelaySign>

0 commit comments

Comments
 (0)