stack resources module for 2018-03-01-hybrid profile #7051

bganapa · 2018-08-26T07:32:57Z

Description

Copy of the version 6.0.0 with back ported fix for ADFS Roleassignment fix and older version of Authorization Client

Checklist

I have read the Submitting Changes section of CONTRIBUTING.md
The title of the PR is clear and informative
The appropriate change log has been updated
The PR does not introduce breaking changes
If applicable, the changes made in the PR have proper test coverage
For public API changes to cmdlets:
- the changes have gone through a cmdlet design review
- the cmdlet markdown files were generated using the platyPS module

bganapa · 2018-08-27T16:30:53Z

@MiYanni Is this failure known? I am going to retry..
Microsoft.Azure.Commands.Profile.Test.TelemetryTests.DataCollectionHandlesSerializationErrors
System.ArgumentException : An item with the same key has already been added.

I

MiYanni · 2018-08-27T16:59:13Z

@bganapa We've been having intermittent failures with the Telemetry tests. We will need to investigate. Thanks for letting us know.

bganapa · 2018-08-27T18:02:25Z

Cred scanner issues :(

MiYanni · 2018-08-27T18:32:49Z

@bganapa We skipped DataCollectionHandlesSerializationErrors in the latest from the preview branch. Pull in to get that update.

For credscan, if those files have been there for a while (not real issues), you simply need to add the exception to the CredScanSuppressions.json file in the tools folder.

bganapa · 2018-08-29T19:59:19Z

This should be good to merge except for the localfeed package

maddieclayton · 2018-08-29T23:12:47Z

Common packages can be found here: https://azuresdkci.westus2.cloudapp.azure.com/view/PowerShell/job/ps-common-sign/94/

maddieclayton · 2018-08-30T21:21:45Z

@bganapa This PR has the common changes you need: #6986. Once it gets merged I'll pull in the latest from preview into this PR and it should build.

maddieclayton · 2018-08-30T21:22:12Z

@bganapa In the meantime, please resolve the merge conflict that have come up so we can get this in as fast as possible.

bganapa · 2018-08-30T21:24:04Z

@maddieclayton i just rebased in the morning :). i will do it again now

bganapa · 2018-08-31T01:14:47Z

Rebased again as #6986 is merged

maddieclayton · 2018-08-31T03:48:20Z

Looks like just cred scan is failing now: https://azuresdkci.westus2.cloudapp.azure.com/job/powershell/7052/artifact/src/Package/CredentialScannerOutput/CredScanIssues.csv/*view*/

deathly809 · 2018-08-31T20:27:56Z

@maddieclayton passing! 💯

bganapa · 2018-08-31T20:30:03Z

Should be good to merge

deathly809 · 2018-08-31T20:45:07Z

src/StackAdmin/Resources/Commands.ResourceManager/Cmdlets/Commands.Resources.Rest.csproj

+      <SubType>Designer</SubType>
+    </None>
+  </ItemGroup>
+<!--  <ItemGroup>


Delete commented out code!

deathly809 · 2018-08-31T20:48:13Z

src/StackAdmin/Resources/Commands.Resources.Test/Commands.Resources.Test.csproj

+    <Reference Include="Microsoft.Azure.Insights">
+      <HintPath>..\..\..\packages\Microsoft.Azure.Insights.0.10.0-preview\lib\net45\Microsoft.Azure.Insights.dll</HintPath>
+    </Reference>
+    <!--   <Reference Include="Hyak.Common">


Commented code.

deathly809 · 2018-08-31T20:48:37Z

src/StackAdmin/Resources/Commands.Resources.Test/Commands.Resources.Test.csproj

+    <Compile Include="ResourceGroups\NewAzureResourceGroupCommandTests.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <!--    <ProjectReference Include="..\..\..\..\Common\Commands.Common.Authentication.Abstractions\Commands.Common.Authentication.Abstractions.csproj">


Commented code.

deathly809 · 2018-08-31T20:49:11Z

src/StackAdmin/Resources/Commands.Resources/Commands.Resources.csproj

+    <Compile Include="Models.ResourceGroups\ResourceClient.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <!--    <ProjectReference Include="..\..\..\Common\Commands.Common.Authentication.Abstractions\Commands.Common.Authentication.Abstractions.csproj">


Commented out code.

deathly809 · 2018-08-31T20:49:21Z

src/StackAdmin/Resources/Commands.Resources/Commands.Resources.csproj

+    <Reference Include="Microsoft.Azure.Management.ResourceManager, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.ResourceManager.1.6.0-preview\lib\net452\Microsoft.Azure.Management.ResourceManager.dll</HintPath>
+    </Reference>
+    <!--<Reference Include="Microsoft.Azure.Management.Authorization, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">


Commented out code.

src/StackAdmin/Resources/Commands.Resources/packages.config

… Microsoft.Azure.Management.ResourceManager version 1.9.0-preview, Tests earliet had 1.6.0-preview version reference

…eview comments

…PackageFolder in common targets

bganapa · 2018-09-03T01:59:06Z

@markcowl
psh-demand -https://azuresdkci.westus2.cloudapp.azure.com/job/powershell-demand/1074/
ps-sign - https://azuresdkci.westus2.cloudapp.azure.com/view/PowerShell/job/ps-sign/1145/
Running now

bganapa · 2018-09-03T05:50:20Z

ps-sign is here https://azuresdkci.westus2.cloudapp.azure.com/view/PowerShell/job/ps-sign/1148/

bganapa · 2018-09-04T17:26:49Z

@markcowl, @maddieclayton ps-sign and ps-demand are successful. This should be good to merge

markcowl · 2018-09-04T17:59:59Z

psnetsign: https://azuresdkci.westus2.cloudapp.azure.com/view/PowerShell/job/psnetsign/148/

maddieclayton · 2018-09-04T18:26:56Z

@bganapa I am currently seeing an error at the bottom of your build (not sure why it isn't failing the build): 22:33:53 MSBUILD : error : CA0501 : Unable to read output report: c:\workspace\powershell\tools\..\src\stack\Debug\ResourceManager\AzureResourceManager\AzureRM.Resources\Microsoft.Azure.Commands.Resources.dll.CodeAnalysisLog.xml [c:\workspace\powershell\src\StackAdmin\Resources\Commands.Resources\Commands.Resources.csproj]

Mark suspects that this could be fixed by removing this line: https://github.com/Azure/azure-powershell/blob/preview/src/ResourceManager/Resources/Commands.Resources/Commands.Resources.csproj#L205

…lder

maddieclayton · 2018-09-04T21:16:10Z

src/StackAdmin/Resources/Commands.ResourceManager/Cmdlets/Commands.Resources.Rest.csproj

@@ -20,7 +20,7 @@
    <DebugSymbols>true</DebugSymbols>
    <DebugType>full</DebugType>
    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\..\Stack\Debug\ResourceManager\AzureResourceManager\AzureRM.Resources\</OutputPath>
+    <OutputPath>$(StackPackageFolder)\Debug\ResourceManager\AzureResourceManager\AzureRM.Resources\</OutputPath>


Can you revert this change? I think creating that StackPackageFolder might be what is failing the build (it is still failing after the latest change)

maddieclayton · 2018-09-05T00:25:08Z

Something weird is happening with Jenkins, but the build is passing: https://azuresdkci.westus2.cloudapp.azure.com/job/powershell/7140/. Merging now.

addressed.

bganapa requested review from markcowl and MiYanni August 26, 2018 07:32

azuresdkci1x added the needs-review label Aug 26, 2018

maddieclayton added needs-revision and removed needs-review labels Aug 27, 2018

maddieclayton assigned bganapa Aug 27, 2018

bganapa force-pushed the resources-2018 branch from c28e44b to 08162c5 Compare August 27, 2018 23:09

maddieclayton added the Azure Stack label Aug 28, 2018

bganapa force-pushed the resources-2018 branch from 08162c5 to 2d347d9 Compare August 28, 2018 19:38

bganapa force-pushed the resources-2018 branch from e1caa06 to 5603d45 Compare August 30, 2018 18:51

bganapa force-pushed the resources-2018 branch 2 times, most recently from 6f74460 to 9dbb3d2 Compare August 31, 2018 01:13

deathly809 reviewed Aug 31, 2018

View reviewed changes

markcowl removed the needs-review label Aug 31, 2018

markcowl previously requested changes Aug 31, 2018

View reviewed changes

src/StackAdmin/Resources/Commands.Resources/packages.config Outdated Show resolved Hide resolved

bganapa added 9 commits September 1, 2018 20:01

stack resources module for 2018-03-01-hybrid profile

82f98a9

Fixing test project build failure

2879d9a

Updating module versio dependencies

d26ce2f

fixing credscan issues and adding suppresssions

d937054

adding another credscan suppression and fixing tests for the refrence…

29c165d

… Microsoft.Azure.Management.ResourceManager version 1.9.0-preview, Tests earliet had 1.6.0-preview version reference

adding suppressions again, got removed in rebase conflicts

4728ab4

Removing the commented out code

3d9ac45

removing .net core projects, updating assmebly versions, addressing r…

2db64e1

…eview comments

Fixing LibrarySOurceFolder to LibraryNugetPackageFolder, adding Stack…

914b5b8

…PackageFolder in common targets

bganapa force-pushed the resources-2018 branch from 34dd351 to 914b5b8 Compare September 2, 2018 03:15

bganapa added needs-review and removed needs-revision labels Sep 3, 2018

bganapa assigned markcowl and maddieclayton and unassigned bganapa Sep 3, 2018

removing modules from AzureRM modules

4f394da

Removing binplacing of azure resources module in to stack packages fo…

77ba105

…lder

maddieclayton suggested changes Sep 4, 2018

View reviewed changes

Reverting StackPackageFolder usage

cd72719

maddieclayton approved these changes Sep 5, 2018

View reviewed changes

maddieclayton merged commit 9b661c6 into Azure:preview Sep 5, 2018

stack resources module for 2018-03-01-hybrid profile #7051

stack resources module for 2018-03-01-hybrid profile #7051

Uh oh!

Conversation

bganapa commented Aug 26, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Checklist

Uh oh!

bganapa commented Aug 27, 2018

Uh oh!

MiYanni commented Aug 27, 2018

Uh oh!

bganapa commented Aug 27, 2018

Uh oh!

MiYanni commented Aug 27, 2018

Uh oh!

bganapa commented Aug 29, 2018

Uh oh!

maddieclayton commented Aug 29, 2018

Uh oh!

maddieclayton commented Aug 30, 2018

Uh oh!

maddieclayton commented Aug 30, 2018

Uh oh!

bganapa commented Aug 30, 2018

Uh oh!

bganapa commented Aug 31, 2018

Uh oh!

maddieclayton commented Aug 31, 2018

Uh oh!

deathly809 commented Aug 31, 2018

Uh oh!

bganapa commented Aug 31, 2018

Uh oh!

deathly809 Aug 31, 2018

Choose a reason for hiding this comment

Uh oh!

deathly809 Aug 31, 2018

Choose a reason for hiding this comment

Uh oh!

deathly809 Aug 31, 2018

Choose a reason for hiding this comment

Uh oh!

deathly809 Aug 31, 2018

Choose a reason for hiding this comment

Uh oh!

deathly809 Aug 31, 2018

Choose a reason for hiding this comment

Uh oh!

Uh oh!

bganapa commented Sep 3, 2018

Uh oh!

bganapa commented Sep 3, 2018

Uh oh!

bganapa commented Sep 4, 2018

Uh oh!

markcowl commented Sep 4, 2018

Uh oh!

maddieclayton commented Sep 4, 2018

Uh oh!

maddieclayton Sep 4, 2018

Choose a reason for hiding this comment

Uh oh!

maddieclayton commented Sep 5, 2018

Uh oh!

Uh oh!

bganapa commented Aug 26, 2018 •

edited

Loading