Skip to content

Commit d46ec39

Browse files
stankovskistankovski
committed
Merge branch 'clu' of https://github.com/Azure/azure-powershell into clu
2 parents ef82835 + 61e9901 commit d46ec39

File tree

3 files changed

+220
-11
lines changed

3 files changed

+220
-11
lines changed

‎clu-getstart.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22

33
### Prerequsites
44

5-
Visual Studio 2015 RTM with ASP.NET. For details, check out the [installation doc](http://docs.asp.net/en/latest/getting-started/installing-on-windows.html).
5+
* Visual Studio 2015 RTM with ASP.NET. For details, check out the [installation doc](http://docs.asp.net/en/latest/getting-started/installing-on-windows.html).
66

77
Note, after done, run `dnvm list` command to check the 'coreclr' runtime is installed with right version of `1.0.0-rc1-final`. If not, run `dnvm install 1.0.0-rc1-final -r coreclr -a x64 -p`. Remember always use `-p` flag, so the selection can persist.
88

9+
* Get the latest dotnet from "https://azureclu.blob.core.windows.net/tools/dotnet-win-x64.latest.zip", unzip, then add its bin folder to the PATH
10+
911
### Project Artifacts
1012

1113
CLUPackages require some additional files to direct generation of indexing, and to provide shortcuts when files are installed. These files can be copied from the Profile project and updated for each package.

‎src/CLU/Microsoft.Azure.Commands.Compute/Microsoft.Azure.Commands.Compute.format.ps1xml

Lines changed: 208 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -636,6 +636,213 @@
636636
</ListEntries>
637637
</ListControl>
638638
</View>
639-
639+
<View>
640+
<Name>Microsoft.Azure.Commands.Compute.Models.PSAvailabilitySet</Name>
641+
<ViewSelectedBy>
642+
<TypeName>Microsoft.Azure.Commands.Compute.Models.PSAvailabilitySet</TypeName>
643+
</ViewSelectedBy>
644+
<ListControl>
645+
<ListEntries>
646+
<ListEntry>
647+
<ListItems>
648+
<ListItem>
649+
<Label>ResourceGroupName</Label>
650+
<PropertyName>ResourceGroupName</PropertyName>
651+
</ListItem>
652+
<ListItem>
653+
<Label>Id</Label>
654+
<PropertyName>Id</PropertyName>
655+
</ListItem>
656+
<ListItem>
657+
<Label>Name</Label>
658+
<PropertyName>Name</PropertyName>
659+
</ListItem>
660+
<ListItem>
661+
<Label>Type</Label>
662+
<PropertyName>Type</PropertyName>
663+
</ListItem>
664+
<ListItem>
665+
<Label>Location</Label>
666+
<PropertyName>Location</PropertyName>
667+
</ListItem>
668+
<ListItem>
669+
<Label>Tags</Label>
670+
<PropertyName>TagsText</PropertyName>
671+
</ListItem>
672+
<ListItem>
673+
<Label>PlatformFaultDomainCount</Label>
674+
<PropertyName>PlatformFaultDomainCount</PropertyName>
675+
</ListItem>
676+
<ListItem>
677+
<Label>PlatformUpdateDomainCount</Label>
678+
<PropertyName>PlatformUpdateDomainCount</PropertyName>
679+
</ListItem>
680+
<ListItem>
681+
<Label>Statuses</Label>
682+
<PropertyName>StatusesText</PropertyName>
683+
</ListItem>
684+
<ListItem>
685+
<Label>VirtualMachinesReferences</Label>
686+
<PropertyName>VirtualMachinesReferencesText</PropertyName>
687+
</ListItem>
688+
</ListItems>
689+
</ListEntry>
690+
</ListEntries>
691+
</ListControl>
692+
</View>
693+
<View>
694+
<Name>Microsoft.Azure.Commands.Compute.Models.PSVirtualMachineSize</Name>
695+
<ViewSelectedBy>
696+
<TypeName>Microsoft.Azure.Commands.Compute.Models.PSVirtualMachineSize</TypeName>
697+
</ViewSelectedBy>
698+
<ListControl>
699+
<ListEntries>
700+
<ListEntry>
701+
<ListItems>
702+
<ListItem>
703+
<Label>MaxDataDiskCount</Label>
704+
<PropertyName>MaxDataDiskCount</PropertyName>
705+
</ListItem>
706+
<ListItem>
707+
<Label>MemoryInMB</Label>
708+
<PropertyName>MemoryInMB</PropertyName>
709+
</ListItem>
710+
<ListItem>
711+
<Label>Name</Label>
712+
<PropertyName>Name</PropertyName>
713+
</ListItem>
714+
<ListItem>
715+
<Label>NumberOfCores</Label>
716+
<PropertyName>NumberOfCores</PropertyName>
717+
</ListItem>
718+
<ListItem>
719+
<Label>OSDiskSizeInMB</Label>
720+
<PropertyName>OSDiskSizeInMB</PropertyName>
721+
</ListItem>
722+
<ListItem>
723+
<Label>ResourceDiskSizeInMB</Label>
724+
<PropertyName>ResourceDiskSizeInMB</PropertyName>
725+
</ListItem>
726+
</ListItems>
727+
</ListEntry>
728+
</ListEntries>
729+
</ListControl>
730+
</View>
731+
<View>
732+
<Name>Microsoft.Azure.Commands.Compute.Models.PSUsage</Name>
733+
<ViewSelectedBy>
734+
<TypeName>Microsoft.Azure.Commands.Compute.Models.PSUsage</TypeName>
735+
</ViewSelectedBy>
736+
<ListControl>
737+
<ListEntries>
738+
<ListEntry>
739+
<ListItems>
740+
<ListItem>
741+
<Label>CurrentValue</Label>
742+
<PropertyName>CurrentValue</PropertyName>
743+
</ListItem>
744+
<ListItem>
745+
<Label>Limit</Label>
746+
<PropertyName>Limit</PropertyName>
747+
</ListItem>
748+
<ListItem>
749+
<Label>Name</Label>
750+
<PropertyName>NameText</PropertyName>
751+
</ListItem>
752+
<ListItem>
753+
<Label>Unit</Label>
754+
<PropertyName>UnitText</PropertyName>
755+
</ListItem>
756+
</ListItems>
757+
</ListEntry>
758+
</ListEntries>
759+
</ListControl>
760+
</View>
761+
<View>
762+
<Name>Microsoft.Azure.Commands.Compute.Models.PSVirtualMachine</Name>
763+
<ViewSelectedBy>
764+
<TypeName>Microsoft.Azure.Commands.Compute.Models.PSVirtualMachine</TypeName>
765+
</ViewSelectedBy>
766+
<ListControl>
767+
<ListEntries>
768+
<ListEntry>
769+
<ListItems>
770+
<ListItem>
771+
<Label>ResourceGroupName</Label>
772+
<PropertyName>ResourceGroupName</PropertyName>
773+
</ListItem>
774+
<ListItem>
775+
<Label>Id</Label>
776+
<PropertyName>Id</PropertyName>
777+
</ListItem>
778+
<ListItem>
779+
<Label>Name</Label>
780+
<PropertyName>Name</PropertyName>
781+
</ListItem>
782+
<ListItem>
783+
<Label>Type</Label>
784+
<PropertyName>Type</PropertyName>
785+
</ListItem>
786+
<ListItem>
787+
<Label>Location</Label>
788+
<PropertyName>Location</PropertyName>
789+
</ListItem>
790+
<ListItem>
791+
<Label>Tags</Label>
792+
<PropertyName>TagsText</PropertyName>
793+
</ListItem>
794+
<ListItem>
795+
<Label>AvailabilitySetReference</Label>
796+
<PropertyName>AvailabilitySetReferenceText</PropertyName>
797+
</ListItem>
798+
<ListItem>
799+
<Label>DiagnosticsProfile</Label>
800+
<PropertyName>DiagnosticsProfileText</PropertyName>
801+
</ListItem>
802+
<ListItem>
803+
<Label>Extensions</Label>
804+
<PropertyName>ExtensionsText</PropertyName>
805+
</ListItem>
806+
<ListItem>
807+
<Label>HardwareProfile</Label>
808+
<PropertyName>HardwareProfileText</PropertyName>
809+
</ListItem>
810+
<ListItem>
811+
<Label>InstanceView</Label>
812+
<PropertyName>InstanceViewText</PropertyName>
813+
</ListItem>
814+
<ListItem>
815+
<Label>NetworkProfile</Label>
816+
<PropertyName>NetworkProfileText</PropertyName>
817+
</ListItem>
818+
<ListItem>
819+
<Label>OSProfile</Label>
820+
<PropertyName>OSProfileText</PropertyName>
821+
</ListItem>
822+
<ListItem>
823+
<Label>Plan</Label>
824+
<PropertyName>PlanText</PropertyName>
825+
</ListItem>
826+
<ListItem>
827+
<Label>ProvisioningState</Label>
828+
<PropertyName>ProvisioningState</PropertyName>
829+
</ListItem>
830+
<ListItem>
831+
<Label>StorageProfile</Label>
832+
<PropertyName>StorageProfileText</PropertyName>
833+
</ListItem>
834+
<ListItem>
835+
<Label>DataDiskNames</Label>
836+
<PropertyName>DataDiskNames</PropertyName>
837+
</ListItem>
838+
<ListItem>
839+
<Label>NetworkInterfaceIDs</Label>
840+
<PropertyName>NetworkInterfaceIDs</PropertyName>
841+
</ListItem>
842+
</ListItems>
843+
</ListEntry>
844+
</ListEntries>
845+
</ListControl>
846+
</View>
640847
</ViewDefinitions>
641848
</Configuration>

‎tools/CLU/BuildPackage.ps1

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,23 @@
22

33
if (!(Test-Path $cmdletsDir))
44
{
5-
throw "cmdletsDir: '$cmdletsDir' must be an existing directory containing cmdlet code"
5+
throw "cmdletsDir: '$cmdletsDir' must be an existing directory containing cmdlet code"
66
}
77
if (!(Test-Path $outputDir))
88
{
9-
throw "outputDir: '$outputDir' must be an existing directory"
9+
throw "outputDir: '$outputDir' must be an existing directory"
1010
}
1111

1212
if ([string]::IsNullOrWhiteSpace($env:WORKSPACE) -or !(Test-Path $env:WORKSPACE))
1313
{
14-
throw "env:WORKSPACE: '$env:WORKSPACE' must be an existing directory"
14+
throw "env:WORKSPACE: '$env:WORKSPACE' must be an existing directory"
1515
}
1616

1717
$packageSource = $packageSource.TrimEnd('\\')
1818
Write-Host "using package id: $packageId, package source: $packageSource, packageVersion: $packageVersion"
1919
dotnet publish $cmdletsDir -f dnxcore50 -r win7-x64 -o $packageSource
2020
Copy-Item -Path $cmdletsDir\content -Destination $packageSource\content -Recurse -Force
21+
Copy-Item -Path $cmdletsDir\*xml -Destination $packageSource\content -Force
2122

2223
$nuSpecTemplate = (Get-ChildItem ([System.IO.Path]::Combine($cmdletsDir, ($packageId + ".nuspec.template"))))
2324
$nuSpecOutput = [System.IO.Path]::Combine($packageSource, ($packageId + ".nuspec"))
@@ -27,26 +28,25 @@ $fileContent = Get-Content $nuSpecTemplate
2728
$renameFileExists = Test-Path -Path ([System.IO.Path]::Combine($packageSource, "content", "rename.cfg"))
2829
$files = (Get-ChildItem $packageSource | Where -FilterScript {!$_.Name.Contains("nuspec")} | Select-Object -Property Name)
2930
$refFiles = $files | Where -FilterScript { $_.Name.EndsWith(".dll")}
30-
$contentFiles = $files | Where -FilterScript { $_.Name.EndsWith("xml")}
3131
$refFileText = ""
3232
$refFiles | %{$refFileText += (" <reference file=""" + $_.Name + """/>`r`n")}
3333
$contentFileText = ""
34-
$contentFiles | %{ $contentFileText += (" <file src=""" + $_.Name + """ target=""content""/>`r`n")}
3534
if ($packageId -ne "Microsoft.CLU.Commands")
3635
{
37-
$contentFileText += " <file src=""content\*.lx"" target=""content""/>`r`n"
36+
$contentFileText += " <file src=""content\*.lx"" target=""content""/>`r`n"
37+
$contentFileText += " <file src=""content\*xml"" target=""content""/>`r`n"
3838
}
3939
if ($renameFileExists)
4040
{
41-
$contentFileText += " <file src=""content\rename.cfg"" target=""content""/>`r`n"
41+
$contentFileText += " <file src=""content\rename.cfg"" target=""content""/>`r`n"
4242
}
4343
$contentFileText += " <file src=""content\package.cfg"" target=""content""/>`r`n"
4444
$sourceFileText = ""
4545
$refFiles | %{$sourceFileText += (" <file src=""" + $_.Name + """ target=""lib\dnxcore50""/>`r`n")}
4646
$outputContent = $fileContent -replace "%PackageVersion%", $packageVersion
4747
$outputContent = $outputContent -replace "%ReferenceFiles%", $refFileText
48-
$outputContent = $outputContent -replace "%SourceFiles%", $sourceFileText
49-
$outputContent = $outputContent -replace "%ContentFiles%", $contentFileText
48+
$outputContent = $outputContent -replace "%SourceFiles%", $sourceFileText
49+
$outputContent = $outputContent -replace "%ContentFiles%", $contentFileText
5050
Set-Content -Value $outputContent -Path $nuspecOutput
5151

5252
Write-Host "Creating nuget package..."

0 commit comments

Comments
 (0)