diff --git a/Source/tools/chocolateyinstall.ps1 b/Source/tools/chocolateyinstall.ps1
index fbcca97..4e050d5 100644
--- a/Source/tools/chocolateyinstall.ps1
+++ b/Source/tools/chocolateyinstall.ps1
@@ -3,8 +3,8 @@ param(
# The path to put our kernel.json folders in
$KernelFolder,
- # The path where the kernel executables are (should contain at least the 'netcoreapp2.0' or 'net461' folder)
- $InstallPath = $(Split-Path $PSScriptRoot)
+ # The path where the kernel executables are (should contain at least the 'Windows' folder)
+ $InstallPath
)
# Use the .NET Core APIs to determine the current platform; if a runtime
# exception is thrown, we are on FullCLR, not .NET Core.
@@ -27,6 +27,9 @@ try {
}
}
+if (!$InstallPath) {
+ $InstallPath = Split-Path $PSScriptRoot
+}
if ($IsWindows) {
if (!$KernelFolder) {
diff --git a/build.ps1 b/build.ps1
index 096b498..77e0ebd 100644
--- a/build.ps1
+++ b/build.ps1
@@ -1,5 +1,5 @@
param(
- ${Prefix} = "-beta-8",
+ ${Prefix},
${Configuration} = "Release",
@@ -26,14 +26,14 @@ dotnet restore
Pop-Location
if ($Platform -contains "Windows") {
Push-Location ./Source
- dotnet publish -f netcoreapp2.0 -c ${Configuration} -r win7-x64 --version-suffix $Prefix
+ dotnet publish -f netcoreapp2.0 -c ${Configuration} -r win7-x64 #--version-suffix $Prefix
Pop-Location
Move-Item "Source/Output/${Configuration}/netcoreapp2.0/win7-x64/publish" "Output/${Configuration}/Windows"
Get-ChildItem $PSHome -Directory | Copy-Item -Destination "Output/${Configuration}/Windows" -Recurse
}
if ($Platform -contains "Linux") {
Push-Location ./Source
- dotnet publish -f netcoreapp2.0 -c ${Configuration} -r linux-x64 --version-suffix $Prefix
+ dotnet publish -f netcoreapp2.0 -c ${Configuration} -r linux-x64 #--version-suffix $Prefix
Pop-Location
Move-Item "Source/Output/${Configuration}/netcoreapp2.0/linux-x64/publish" "Output/${Configuration}/Linux"
Write-Host $PSHome
@@ -41,7 +41,7 @@ if ($Platform -contains "Linux") {
}
if ($Platform -contains "OSx") {
Push-Location ./Source
- dotnet publish -f netcoreapp2.0 -c ${Configuration} -r osx.10.12-x64 --version-suffix $Prefix
+ dotnet publish -f netcoreapp2.0 -c ${Configuration} -r osx.10.12-x64 #--version-suffix $Prefix
Pop-Location
Move-Item "Source/Output/${Configuration}/netcoreapp2.0/osx.10.12-x64/publish" "Output/${Configuration}/Mac"
Get-ChildItem $PSHome -Directory | Copy-Item -Destination "Output/${Configuration}/Mac" -Recurse
@@ -55,21 +55,24 @@ if ($Platform -contains "OSx") {
Copy-Item "./Source/tools" "./Output/${Configuration}" -Recurse
if($Package) {
+ if($Prefix) {
+ $Prefix = "-" + $Prefix
+ }
# Create a catalog and validation
New-FileCatalog -CatalogFilePath "./Output/${Configuration}/tools/Jupyter-PowerShell.cat" -Path Output/${Configuration}/
if(Get-Module Authenticode -List) {
- Authenticode/Set-AuthenticodeSignature "./Output/${Configuration}/tools/Jupyter-PowerShell.cat"
+ Authenticode\Set-AuthenticodeSignature "./Output/${Configuration}/tools/Jupyter-PowerShell.cat"
}
- if(Get-Command choco) {
+ if(Get-Command choco -ErrorAction SilentlyContinue) {
choco pack --outputdirectory ./Output/${Configuration}
if ($ChocoApiKey) {
- choco push ./Output/${Configuration}/jupyter-powershell.1.0.0-$($Prefix).nupkg --api-key $ChocoApiKey
+ choco push ./Output/${Configuration}/jupyter-powershell.1.0.0$($Prefix).nupkg --api-key $ChocoApiKey
}
} else {
Write-Warning "Could not find choco command.
To package, run: choco pack --outputdirectory $(Resolve-Path Output/${Configuration})
- To publish, run: choco push $(Resolve-Path Output/${Configuration}/jupyter-powershell.1.0.0-$($Prefix).nupkg)"
+ To publish, run: choco push $(Join-Path (Resolve-Path Output/${Configuration}) jupyter-powershell.1.0.0$($Prefix).nupkg)"
}
}
diff --git a/jupyter-powershell.nuspec b/jupyter-powershell.nuspec
index b6f16af..07b8632 100644
--- a/jupyter-powershell.nuspec
+++ b/jupyter-powershell.nuspec
@@ -21,7 +21,7 @@ This is a nuspec. It mostly adheres to https://docs.nuget.org/create/Nuspec-Refe
- 1.0.0-beta-8
+ 1.0.0
https://github.com/Jaykul/Jupyter-PowerShell/releases
Joel "Jaykul" Bennett
@@ -50,9 +50,9 @@ This is a nuspec. It mostly adheres to https://docs.nuget.org/create/Nuspec-Refe
-
+