-
Notifications
You must be signed in to change notification settings - Fork 4k
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.
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
Netcore fixes. #5063
Conversation
@cormacpayne, can you take a look at this? A while back, I added a property to the |
4bcd3c5
to
e35a62d
Compare
@twitchax ping me when you're ready for me to review it |
@maddieclayton, probably good to go after build. |
@maddieclayton, ok! I manually fixed for the psm1: no reason not to, in my opinion. The rest of the psd1 has stuff that depends on the build placing the files in the right places. |
@@ -9,7 +9,7 @@ | |||
@{ | |||
|
|||
# Script module or binary module file associated with this manifest. | |||
# RootModule = '' | |||
RootModule = '.\AzureRM.Websites.Netcore.psm1' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think this is the way we want to do it - when I asked Mark he said this would make debugging more difficult. I'll try to figure out a better way to do this in the build.proj file
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@maddieclayton and @markcowl, what are the debug issues? Maybe it's Netcore, but I can debug just fine the way it is. What problems does this cause on desktop?
Also, this makes dynamic completers work without having to do a bunch of changes/fixes to UpdateModules and PublishModules.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@twitchax see my new PR - this should fix the issue (I also added you as a reviewer)
build.proj
Outdated
<Artifacts Include="@(GetAllFiles->'%(RootDir)%(Directory)'->Distinct())" /> | ||
</ItemGroup> | ||
|
||
<RemoveDir Directories="%(Artifacts.Identity)" ContinueOnError="true" /> | ||
|
||
<!-- How did these even get here? --> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Did you mean to leave this comment in?
@@ -9,7 +9,7 @@ | |||
@{ | |||
|
|||
# Script module or binary module file associated with this manifest. | |||
# RootModule = '' | |||
RootModule = '.\AzureRM.Compute.Netcore.psm1' |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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.
@@ -182,4 +183,8 @@ | |||
<Folder Include="VhdManagement\Model\Persistance\" /> | |||
</ItemGroup> | |||
|
|||
<ItemGroup> | |||
<Content Include="help\**\*" CopyToPublishDirectory="PreserveNewest" /> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why CopyToPublishDirectory and not CopyToOutputDirectory? Just curious. Also, is there a reason you don't implement it exactly as it is done in the non-netcore csproj files?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Genius! My bad.
@@ -9,7 +9,7 @@ | |||
@{ | |||
|
|||
# Script module or binary module file associated with this manifest. | |||
# RootModule = '' | |||
RootModule = '.\AzureRM.Websites.Netcore.psm1' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@twitchax see my new PR - this should fix the issue (I also added you as a reviewer)
@@ -265,31 +265,34 @@ if ($Profile -eq "Stack") | |||
} | |||
|
|||
$resourceManagerRootFolder = "$packageFolder\$buildConfig\ResourceManager\AzureResourceManager" | |||
$publishToLocal = test-path $repositoryLocation |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why did you delete this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No action based on discussion today.
@azuresdkci test this please |
'netcoreapp2.0\Microsoft.WindowsAzure.Storage.dll', | ||
'netcoreapp2.0\System.Spatial.dll' | ||
RequiredAssemblies = '.\Microsoft.Azure.Management.Storage.dll', | ||
'.\Microsoft.Data.Edm.dll', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
FYI, "." paths were not working in Linux in one of the beta builds. Please make sure this will note break Linux modules.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This was fixed, and it works perfectly fine in linux. :)
@cormacpayne, this should be ready. :) |
@cormacpayne, ping. :) |
This change will cause the build to fail when a cmdlet name cannot be mapped to a documentation group.
In addition, there are some fixes to the Netcore build.
This checklist is used to make sure that common guidelines for a pull request are followed. You can find a more complete discussion of PowerShell cmdlet best practices here.
General Guidelines
Testing Guidelines
Cmdlet Signature Guidelines
ShouldProcess
and haveSupportShouldProcess=true
specified in the cmdlet attribute. You can find more information onShouldProcess
here.OutputType
attribute if any output is produced - if the cmdlet produces no output, it should implement aPassThru
parameter.Cmdlet Parameter Guidelines