Skip to content

Netcore fixes. #5063

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Dec 15, 2017
Merged

Netcore fixes. #5063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3618743
Netcore build fixes.
twitchax Dec 6, 2017
4c8a54c
Fix for resources.
twitchax Dec 6, 2017
5445007
Merge.
twitchax Dec 7, 2017
01edb2c
Fix merge miss.
twitchax Dec 7, 2017
3813e7e
Fix for build.
twitchax Dec 7, 2017
84473f4
Make the build a bit simpler.
twitchax Dec 7, 2017
7327bec
Update Netcore psd1.
twitchax Dec 7, 2017
15b94d4
Merge branch 'preview' into preview
cormacpayne Dec 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@

# Include the build.
!src/Package/Release/ResourceManager/**/*
!src/Package/Debug/ResourceManager/**/*
!src/Package/Debug/ResourceManager/**/*
!tools/InstallationTests/NetcoreTests/**/*
5 changes: 5 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ services:
before_install:
- sudo apt-get update
- sudo apt-get install docker-ce
- curl https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -
- curl https://packages.microsoft.com/config/ubuntu/14.04/prod.list | sudo tee /etc/apt/sources.list.d/microsoft.list
- sudo apt-get update
- sudo apt-get install -y powershell
- sudo pwsh -NonInteractive -NoLogo -NoProfile -Command "Install-Module platyPS -Force -Confirm:\$false -Scope CurrentUser"

script:
- dotnet msbuild build.proj /t:BuildNetcore /p:Configuration=$CONFIG
Expand Down
3 changes: 2 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ FROM microsoft/powershell

ARG CONFIG=Release

COPY src/Package/${CONFIG}/ResourceManager /usr/local/share/powershell/Modules
COPY src/Package/${CONFIG}/ResourceManager/AzureResourceManager /usr/local/share/powershell/Modules
COPY tools/InstallationTests/NetcoreTests /azpstests
52 changes: 26 additions & 26 deletions build.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@
<NuGetLocalBuildTaskPackages>-PackagesDirectory $(LibraryToolsFolder)\BuildPackagesTask\packages</NuGetLocalBuildTaskPackages>

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

<!--
Expand Down Expand Up @@ -271,54 +272,54 @@

<!-- Delete powershell runtime files -->
<ItemGroup>
<RedundantDlls Include="$(PackageDirectory)\**\netcoreapp2.0\publish\Microsoft.Powershell.*.dll" />
<RedundantDlls Include="$(PackageDirectory)\**\netcoreapp2.0\publish\System*.dll"
Exclude="$(PackageDirectory)\**\netcoreapp2.0\publish\System.Security.Cryptography.ProtectedData.dll" />
<RedundantDlls Include="$(PackageDirectory)\**\netcoreapp2.0\publish\Microsoft.VisualBasic.dll" />
<RedundantDlls Include="$(PackageDirectory)\**\netcoreapp2.0\publish\Microsoft.CSharp.dll" />
<RedundantDlls Include="$(PackageDirectory)\**\netcoreapp2.0\publish\Microsoft.CodeAnalysis.dll" />
<RedundantDlls Include="$(PackageDirectory)\**\netcoreapp2.0\publish\Microsoft.CodeAnalysis.CSharp.dll" />
<RedundantDlls Include="$(PackageDirectory)\**\publish\Microsoft.Powershell.*.dll" />
<RedundantDlls Include="$(PackageDirectory)\**\publish\System*.dll"
Exclude="$(PackageDirectory)\**\publish\System.Security.Cryptography.ProtectedData.dll" />
<RedundantDlls Include="$(PackageDirectory)\**\publish\Microsoft.VisualBasic.dll" />
<RedundantDlls Include="$(PackageDirectory)\**\publish\Microsoft.CSharp.dll" />
<RedundantDlls Include="$(PackageDirectory)\**\publish\Microsoft.CodeAnalysis.dll" />
<RedundantDlls Include="$(PackageDirectory)\**\publish\Microsoft.CodeAnalysis.CSharp.dll" />
</ItemGroup>

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

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

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

<!-- Move PSD1 files one folders up -->
<ItemGroup>
<psdFiles Include="$(PackageDirectory)\**\netcoreapp2.0\*.psd1" />
<psdFilesTarget Include="@(psdFiles)">
<DestinationFolder>$([System.IO.Path]::Combine('%(RelativeDir)', '..', '%(FileName)%(Extension)'))</DestinationFolder>
</psdFilesTarget>
</ItemGroup>

<Move SourceFiles="@(psdFilesTarget->'%(FullPath)')" DestinationFiles="@(psdFilesTarget->'%(DestinationFolder)')"/>

<!-- Delete build artifacts -->
<ItemGroup>
<GetAllFiles Include="$(PackageDirectory)\**\netcoreapp2.0\publish\*.*" />
<GetAllFiles Include="$(PackageDirectory)\**\publish\*.*" />
<Artifacts Include="@(GetAllFiles->'%(RootDir)%(Directory)'->Distinct())" />
</ItemGroup>

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

<ItemGroup>
<ExtraPsdFiles Include="$(PackageDirectory)\$(Configuration)\ResourceManager\AzureRM.Resources.Netcore\AzureRM.Tags.Netcore.psd1" />
<ExtraPsdFiles Include="$(PackageDirectory)\$(Configuration)\ResourceManager\AzureRM.Websites.Netcore\AzureRM.Resources.Netcore.psd1" />
<ExtraPsdFiles Include="$(PackageDirectory)\$(Configuration)\ResourceManager\AzureRM.Websites.Netcore\AzureRM.Tags.Netcore.psd1" />
<ExtraPsdFiles Include="$(PackageDirectory)\$(Configuration)\ResourceManager\AzureRM.Network.Netcore\AzureRM.Resources.Netcore.psd1" />
<ExtraPsdFiles Include="$(PackageDirectory)\$(Configuration)\ResourceManager\AzureRM.Network.Netcore\AzureRM.Tags.Netcore.psd1" />
<ExtraPsdFiles Include="$(PackageDirectory)\$(Configuration)\ResourceManager\AzureResourceManager\AzureRM.Resources.Netcore\AzureRM.Tags.Netcore.psd1" />
<ExtraPsdFiles Include="$(PackageDirectory)\$(Configuration)\ResourceManager\AzureResourceManager\AzureRM.Websites.Netcore\AzureRM.Resources.Netcore.psd1" />
<ExtraPsdFiles Include="$(PackageDirectory)\$(Configuration)\ResourceManager\AzureResourceManager\AzureRM.Websites.Netcore\AzureRM.Tags.Netcore.psd1" />
<ExtraPsdFiles Include="$(PackageDirectory)\$(Configuration)\ResourceManager\AzureResourceManager\AzureRM.Network.Netcore\AzureRM.Resources.Netcore.psd1" />
<ExtraPsdFiles Include="$(PackageDirectory)\$(Configuration)\ResourceManager\AzureResourceManager\AzureRM.Network.Netcore\AzureRM.Tags.Netcore.psd1" />
</ItemGroup>

<Delete Files="@(ExtraPsdFiles->'%(FullPath)')"/>

<!-- Update module manifests. -->
<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'"/>

<!-- Generate the help. -->
<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'"/>

<!-- Cleanup extraneous files. -->
<Exec Command="&quot;$(PowerShellCoreCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\CleanupBuild.ps1 -BuildConfig $(Configuration) &quot;" />

<CallTarget Targets="CodeSignBinaries" Condition=" '$(CodeSign)' == 'true' " />
</Target>

Expand Down Expand Up @@ -368,7 +369,6 @@
<Output TaskParameter="Path" PropertyName="WindowsSdkPath"/>
</GetFrameworkSdkPath>


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

Expand Down
30 changes: 15 additions & 15 deletions src/ResourceManager/Compute/AzureRM.Compute.Netcore.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
@{

# Script module or binary module file associated with this manifest.
# RootModule = ''
RootModule = '.\AzureRM.Compute.Netcore.psm1'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm going to make this happen in the UpdateModule.ps1 script. I'll add you as a reviewer and if it looks good to you we can delete it from here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Kept this for now based on discussion today.


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

# Assemblies that must be loaded prior to importing this module
RequiredAssemblies = 'netcoreapp2.0\AutoMapper.dll',
'netcoreapp2.0\Microsoft.Azure.Management.Compute.dll',
'netcoreapp2.0\Microsoft.Azure.Management.KeyVault.dll',
'netcoreapp2.0\Microsoft.Azure.Management.Storage.dll',
'netcoreapp2.0\Microsoft.Data.Edm.dll',
'netcoreapp2.0\Microsoft.Data.OData.dll',
'netcoreapp2.0\Microsoft.WindowsAzure.Storage.dll',
'netcoreapp2.0\System.Spatial.dll',
'netcoreapp2.0\Microsoft.Azure.Commands.Common.Strategies.dll'
RequiredAssemblies = '.\AutoMapper.dll',
'.\Microsoft.Azure.Commands.Common.Strategies.dll',
'.\Microsoft.Azure.Management.Compute.dll',
'.\Microsoft.Azure.Management.KeyVault.dll',
'.\Microsoft.Azure.Management.Storage.dll',
'.\Microsoft.Data.Edm.dll',
'.\Microsoft.Data.OData.dll',
'.\Microsoft.WindowsAzure.Storage.dll',
'.\System.Spatial.dll'

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

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

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

# Modules to import as nested modules of the module specified in RootModule/ModuleToProcess
NestedModules = @('netcoreapp2.0\Microsoft.Azure.Commands.Compute.dll')
NestedModules = @('.\Microsoft.Azure.Commands.Compute.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 = @()
Expand Down
9 changes: 7 additions & 2 deletions src/ResourceManager/Compute/Commands.Compute/Commands.Compute.Netcore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,17 @@
<RootNamespace>Microsoft.Azure.Commands.Compute</RootNamespace>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DefineConstants>TRACE;DEBUG;NETSTANDARD</DefineConstants>
<OutputPath>..\..\..\Package\Debug\ResourceManager\AzureRM.Compute.Netcore\</OutputPath>
<OutputPath>..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.Compute.Netcore\</OutputPath>
<DelaySign>false</DelaySign>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<OutputPath>..\..\..\Package\Release\ResourceManager\AzureRM.Compute.Netcore\</OutputPath>
<OutputPath>..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.Compute.Netcore\</OutputPath>
<DocumentationFile></DocumentationFile>
<SignAssembly>True</SignAssembly>
<DelaySign>True</DelaySign>
Expand Down Expand Up @@ -183,4 +184,8 @@
<Folder Include="VhdManagement\Model\Persistance\" />
</ItemGroup>

<ItemGroup>
<Content Include="help\**\*" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>

</Project>
18 changes: 9 additions & 9 deletions src/ResourceManager/KeyVault/AzureRM.KeyVault.Netcore.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
@{

# Script module or binary module file associated with this manifest.
# RootModule = ''
RootModule = '.\AzureRM.KeyVault.Netcore.psm1'

# Version number of this module.
ModuleVersion = '0.9.6'
ModuleVersion = '0.10.0'

# Supported PSEditions
CompatiblePSEditions = 'Core'
Expand Down Expand Up @@ -51,12 +51,12 @@ PowerShellVersion = '5.1'
# ProcessorArchitecture = ''

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

# Assemblies that must be loaded prior to importing this module
RequiredAssemblies = 'netcoreapp2.0\Microsoft.Azure.KeyVault.dll',
'netcoreapp2.0\Microsoft.Azure.KeyVault.WebKey.dll',
'netcoreapp2.0\Microsoft.Azure.Management.KeyVault.dll'
RequiredAssemblies = '.\Microsoft.Azure.KeyVault.dll',
'.\Microsoft.Azure.KeyVault.WebKey.dll',
'.\Microsoft.Azure.Management.KeyVault.dll'

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

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

# Modules to import as nested modules of the module specified in RootModule/ModuleToProcess
NestedModules = @('netcoreapp2.0\Microsoft.Azure.Commands.KeyVault.dll')
NestedModules = @('.\Microsoft.Azure.Commands.KeyVault.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 = @()
Expand Down Expand Up @@ -139,7 +139,7 @@ PrivateData = @{
# A URL to the license for this module.
LicenseUri = 'https://aka.ms/azps-license'

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

# A URL to an icon representing this module.
Expand Down
9 changes: 7 additions & 2 deletions src/ResourceManager/KeyVault/Commands.KeyVault/Commands.KeyVault.Netcore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,17 @@
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DefineConstants>TRACE;DEBUG;NETSTANDARD</DefineConstants>
<OutputPath>..\..\..\Package\Debug\ResourceManager\AzureRM.KeyVault.Netcore\</OutputPath>
<OutputPath>..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.KeyVault.Netcore\</OutputPath>
<DelaySign>false</DelaySign>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<OutputPath>..\..\..\Package\Release\ResourceManager\AzureRM.KeyVault.Netcore\</OutputPath>
<OutputPath>..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.KeyVault.Netcore\</OutputPath>
<DocumentationFile></DocumentationFile>
<SignAssembly>True</SignAssembly>
<DelaySign>True</DelaySign>
Expand Down Expand Up @@ -73,4 +74,8 @@
</None>
</ItemGroup>

<ItemGroup>
<Content Include="help\**\*" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>

</Project>
12 changes: 6 additions & 6 deletions src/ResourceManager/Network/AzureRM.Network.Netcore.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
@{

# Script module or binary module file associated with this manifest.
# RootModule = ''
RootModule = '.\AzureRM.Network.Netcore.psm1'

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

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

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

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

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

# Modules to import as nested modules of the module specified in RootModule/ModuleToProcess
NestedModules = @('netcoreapp2.0\Microsoft.Azure.Commands.Network.dll')
NestedModules = @('.\Microsoft.Azure.Commands.Network.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 = @()
Expand Down
9 changes: 7 additions & 2 deletions src/ResourceManager/Network/Commands.Network/Commands.Network.Netcore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,17 @@
<RootNamespace>Microsoft.Azure.Commands.Network</RootNamespace>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DefineConstants>TRACE;DEBUG;NETSTANDARD</DefineConstants>
<OutputPath>..\..\..\Package\Debug\ResourceManager\AzureRM.Network.Netcore\</OutputPath>
<OutputPath>..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.Network.Netcore\</OutputPath>
<DelaySign>false</DelaySign>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<OutputPath>..\..\..\Package\Release\ResourceManager\AzureRM.Network.Netcore\</OutputPath>
<OutputPath>..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.Network.Netcore\</OutputPath>
<DocumentationFile></DocumentationFile>
<SignAssembly>True</SignAssembly>
<DelaySign>True</DelaySign>
Expand Down Expand Up @@ -79,4 +80,8 @@
</None>
</ItemGroup>

<ItemGroup>
<Content Include="help\**\*" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions src/ResourceManager/Network/Stack/Commands.Network/Commands.Network.Netcore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@

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

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<OutputPath>..\..\..\Package\Release\ResourceManager\AzureRM.Network.Netcore\</OutputPath>
<OutputPath>..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.Network.Netcore\</OutputPath>
<DocumentationFile></DocumentationFile>
<SignAssembly>True</SignAssembly>
<DelaySign>True</DelaySign>
Expand Down
Loading