Skip to content

Commit

Permalink
modified: .gitignore
Browse files Browse the repository at this point in the history
 	modified:   build.ps1
 	renamed:    publish/VMware.VCDRService-7-26-0-Beta.zip -> publish/VMware.VCDRService-7-26-0.zip
 	modified:   publish/VMware.VCDRService/7.26.0/VMware.VCDRService.psd1
 	modified:   publish/VMware.VCDRService/7.26.0/net/VMware.VCDRService.psd1
 	modified:   publish/VMware.VCDRService/7.26.0/netcore/VMware.VCDRService.psd1
 	modified:   test.ps1
  • Loading branch information
mdaneri committed Apr 17, 2023
1 parent 839cb97 commit a2fc012
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 15 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
/c#.netcode/VCDRTest/Properties/launchSettings.json
c\#.netcode/VCDRTest/VCDRTest.csproj.user
c\#.netcode/VCDRTest/VCDRTest.csproj.user
.vscode/launch.json
1 change: 1 addition & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"request": "launch",
"script": "${file}",
"args": ["-Token 1C8b_P7rZRZNr158n_dH4ZHZ53Fw6fB3ldkD0cUM22ikitr8L-GSRKQiLlbRfpWT" ,"-Server vcdr-44-238-239-230.app.vcdr.vmware.com"]
//.\test.ps1 -Token "1C8b_P7rZRZNr158n_dH4ZHZ53Fw6fB3ldkD0cUM22ikitr8L-GSRKQiLlbRfpWT" -Server "vcdr-44-238-239-230.app.vcdr.vmware.com"
}
]
}
15 changes: 7 additions & 8 deletions build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ Param(
[Parameter(Mandatory = $false)] [string] $GitHubApiKey,
[Parameter(Mandatory = $false)] [string] $OpenApiFile = 'vcdr.yaml',
[Parameter(Mandatory = $false)] [Switch] $Publish,
[Parameter(Mandatory = $false)] [Switch] $Beta
[Parameter(Mandatory = $false)] [String] $Prerelease


)
Expand Down Expand Up @@ -107,8 +107,8 @@ $PLATFORM = 'AnyCPU'
$BASEDIR = $PSScriptRoot

if ([string]::IsNullOrEmpty($Version))
{
$Version = Get-Content -Path $BASEDIR\VERSION
{
$Version = Get-Content -Path $BASEDIR\VERSION
}
$VCDRSERVICE_DIRNAME = 'VMware.VCDRService'
$PUBLISH_FOLDER = "$BASEDIR\publish"
Expand Down Expand Up @@ -184,9 +184,9 @@ $TemplateHeaderPSD1 = @"
"@
#remaining descriptor contents
if ($Beta)
if ($Prerelease)
{
$IsBeta = "# Prerelease string of this module `nPrerelease = 'Beta'"
$IsBeta = "# Prerelease string of this module `nPrerelease = '$Prerelease'"
}
else
{
Expand Down Expand Up @@ -397,9 +397,8 @@ $VariableTemplateCoreNetPSD1 = @"
$TemplateHeaderPSD1 + $VariableTemplateCoreNetPSD1 + $TemplatePSD1 | Set-Content "$VCDRSERVICE\VMware.VCDRService.psd1"
#endregion NetSelectorDescriptor
Set-Location $BASEDIR
#region Archive
if($Beta){$BetaName="-Beta"}else{$BetaName=""}
$DestZip =$("$PUBLISH_FOLDER\VMware.VCDRService-{0}{1}.zip" -f $Version.replace( '.', '-'),$BetaName)
#region Archive
$DestZip = "$PUBLISH_FOLDER\VMware.VCDRService-{0}.zip" -f $Version.replace( '.', '-')
Compress-Archive -Path @("$PUBLISH_FOLDER\VMware.VCDRService", '.\install.ps1', 'LICENSE', 'NOTICE', 'open_source_licenses.txt') -DestinationPath $DestZip
#endregion Archive

Expand Down
Binary file not shown.
4 changes: 2 additions & 2 deletions publish/VMware.VCDRService/7.26.0/VMware.VCDRService.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# Generated by: build.ps1
#
# Generated on: 04/14/2023 19:18:15
# Generated on: 04/16/2023 20:05:26
#
@{
# Version number of this module.
Expand Down Expand Up @@ -100,7 +100,7 @@
ReleaseNotes = 'VMware Cloud Disaster Recovery PowerShell CmdLets'

# Prerelease string of this module
Prerelease = 'Beta'
Prerelease = 'beta-2'

# Flag to indicate whether the module requires explicit user acceptance for install/update/save
# RequireLicenseAcceptance = False
Expand Down
4 changes: 2 additions & 2 deletions publish/VMware.VCDRService/7.26.0/net/VMware.VCDRService.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# Generated by: build.ps1
#
# Generated on: 04/14/2023 19:18:15
# Generated on: 04/16/2023 20:05:26
#
@{
# Version number of this module.
Expand Down Expand Up @@ -109,7 +109,7 @@
ReleaseNotes = 'VMware Cloud Disaster Recovery PowerShell CmdLets'

# Prerelease string of this module
Prerelease = 'Beta'
Prerelease = 'beta-2'

# Flag to indicate whether the module requires explicit user acceptance for install/update/save
# RequireLicenseAcceptance = False
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# Generated by: build.ps1
#
# Generated on: 04/14/2023 19:18:15
# Generated on: 04/16/2023 20:05:26
#
@{
# Version number of this module.
Expand Down Expand Up @@ -100,7 +100,7 @@
ReleaseNotes = 'VMware Cloud Disaster Recovery PowerShell CmdLets'

# Prerelease string of this module
Prerelease = 'Beta'
Prerelease = 'beta-2'

# Flag to indicate whether the module requires explicit user acceptance for install/update/save
# RequireLicenseAcceptance = False
Expand Down
2 changes: 1 addition & 1 deletion test.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ $ErrorActionPreference = 'Stop'
if ( ! $Connect)
{
$Version = Get-Content -Path .\VERSION
Import-Module ".\publish\VMware.VCDRService\$Version\VMware.VCDRService.psd1"
# Import-Module ".\publish\VMware.VCDRService\$Version\VMware.VCDRService.psd1"
Connect-VIServer -Server 10.24.132.72 -User '[email protected]' -Password 'Datrium@01'
if ($Server)
{
Expand Down

0 comments on commit a2fc012

Please sign in to comment.