Skip to content

Commit 84c8c73

Browse files
MichaelMichael
Michael
authored and
Michael
committed
Merge remote-tracking branch 'remotes/upstream/preview' into RemoveHttpNuget
2 parents 54ac4bc + 4034691 commit 84c8c73

File tree

125 files changed

+29059
-143
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

125 files changed

+29059
-143
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

‎TestMappings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@
4444
"src/ResourceManager/DataLakeStore/": [
4545
".\\src\\ResourceManager\\DataLakeStore\\Commands.DataLakeStore.Test\\bin\\Debug\\Microsoft.Azure.Commands.DataLake.Test.dll"
4646
],
47+
"src/ResourceManager/DataMigration/": [
48+
".\\src\\ResourceManager\\DataMigration\\Commands.DataMigration.Test\\bin\\Debug\\Microsoft.Azure.Commands.DataMigration.Test.dll"
49+
],
4750
"src/ResourceManager/DevTestLabs/": [],
4851
"src/ResourceManager/Dns/": [
4952
".\\src\\ResourceManager\\Dns\\Commands.Dns.Test\\bin\\Debug\\Microsoft.Azure.Commands.Dns.Test.dll"

‎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

‎setup/azurecmdfiles.wxi

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -516,6 +516,23 @@
516516
<File Id="fil509D1E7494560B2BB3462B8FAD7954CF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeStore\Microsoft.Azure.Management.DataLake.Store.dll" />
517517
</Component>
518518
</Directory>
519+
<Directory Id="dir737D4AB8FD306B33AFF72CE69894AEC6" Name="AzureRM.DataMigration">
520+
<Component Id="cmpF537AF8D3332C6ECBEC0516187F2220F" Guid="*">
521+
<File Id="fil38B67D67DD39331782A801AB1268A382" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataMigration\AzureRM.DataMigration.psd1" />
522+
</Component>
523+
<Component Id="cmp62BC16A48F4AAB22EAFDB6EA8C458B36" Guid="*">
524+
<File Id="filB3373AF76FB37D674E8110F7B07D406B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataMigration\AzureRM.DataMigration.psm1" />
525+
</Component>
526+
<Component Id="cmpB20E0977CD0B2DFD15CEFF2F07F39AB9" Guid="*">
527+
<File Id="filBFF0F6B3EE0CADBC6E8D145D70B031BB" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataMigration\Microsoft.Azure.Commands.DataMigration.dll" />
528+
</Component>
529+
<Component Id="cmp8D46A82F0869AFC4C01CACAC464F81E9" Guid="*">
530+
<File Id="fil6EA1FAE6CF33BFDC7C44362C0A050A09" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataMigration\Microsoft.Azure.Commands.DataMigration.dll-Help.xml" />
531+
</Component>
532+
<Component Id="cmp636578DE56B109ECA4CF967ED6BE2823" Guid="*">
533+
<File Id="fil9172B5B303F5B98071CEC5BDA731C87B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataMigration\Microsoft.Azure.Management.DataMigration.dll" />
534+
</Component>
535+
</Directory>
519536
<Directory Id="dir58E771D29F659E11F33C1EBA94EBEC2D" Name="AzureRM.DevTestLabs">
520537
<Component Id="cmpB88BB2B8DA875D258057401A820E82D6" Guid="*">
521538
<File Id="filE1512C82B1E6F38CDFD909FFD8C61C64" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DevTestLabs\AzureRM.DevTestLabs.psd1" />
@@ -3282,6 +3299,11 @@
32823299
<ComponentRef Id="cmp3E5522CBA7172D5BE69D628639359496" />
32833300
<ComponentRef Id="cmp001FEDC74DD7D918EFE88F2EB8E4285C" />
32843301
<ComponentRef Id="cmp3C96010EFA751762A76B66B811613835" />
3302+
<ComponentRef Id="cmpF537AF8D3332C6ECBEC0516187F2220F" />
3303+
<ComponentRef Id="cmp62BC16A48F4AAB22EAFDB6EA8C458B36" />
3304+
<ComponentRef Id="cmpB20E0977CD0B2DFD15CEFF2F07F39AB9" />
3305+
<ComponentRef Id="cmp8D46A82F0869AFC4C01CACAC464F81E9" />
3306+
<ComponentRef Id="cmp636578DE56B109ECA4CF967ED6BE2823" />
32853307
<ComponentRef Id="cmpB88BB2B8DA875D258057401A820E82D6" />
32863308
<ComponentRef Id="cmp727F3C3BF9F149CC43CD2F72DB01F9AF" />
32873309
<ComponentRef Id="cmpCF89ADAF131C4033F0441CD44BD5AFF9" />

‎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>

0 commit comments

Comments
 (0)