diff --git a/Jupyter/Jupyter.csproj b/Jupyter/Jupyter.csproj index 23685fe..292b121 100644 --- a/Jupyter/Jupyter.csproj +++ b/Jupyter/Jupyter.csproj @@ -16,9 +16,9 @@ https://github.com/Jaykul/Jupyter-PowerShell en - 1.0.0-beta-3 - 1.0.0.3 - 1.0.0.3 + $(VersionSuffix) + 1.0.0 + $(Version)$(VersionSuffix) diff --git a/PowerShell-Kernel/PowerShell-Kernel.csproj b/PowerShell-Kernel/PowerShell-Kernel.csproj index bd81645..dafb2d8 100644 --- a/PowerShell-Kernel/PowerShell-Kernel.csproj +++ b/PowerShell-Kernel/PowerShell-Kernel.csproj @@ -20,12 +20,11 @@ https://github.com/Jaykul/Jupyter-PowerShell https://github.com/Jaykul/Jupyter-PowerShell en - - 1.0.0-beta-3 - 1.0.0.3 - 1.0.0.3 - - OnOutputUpdated + + + $(VersionSuffix) + 1.0.0 + $(Version)$(VersionSuffix) diff --git a/Release.ipynb b/Release.ipynb index 0b588d9..ae46da6 100644 --- a/Release.ipynb +++ b/Release.ipynb @@ -9,359 +9,10 @@ "data": { "application/json": { "output": [ - { - "Drive": { - "Credential": { - "Password": "", - "UserName": null - }, - "CurrentLocation": "Users\\Joel\\Projects\\Jupyter\\Jupyter-PowerShell", - "Description": "Crucial", - "DisplayRoot": null, - "MaximumSize": null, - "Name": "C", - "Provider": { - "Capabilities": 52, - "Description": "", - "Drives": [ - { - "Credential": { - "Password": "", - "UserName": null - }, - "CurrentLocation": "", - "Description": "Samsung", - "DisplayRoot": null, - "MaximumSize": null, - "Name": "D", - "Root": "D:\\" - }, - { - "Credential": { - "Password": "", - "UserName": null - }, - "CurrentLocation": "", - "Description": "SeaGates", - "DisplayRoot": null, - "MaximumSize": null, - "Name": "E", - "Root": "E:\\" - }, - { - "Credential": { - "Password": "", - "UserName": null - }, - "CurrentLocation": "", - "Description": "Seagate Expansion Drive", - "DisplayRoot": null, - "MaximumSize": null, - "Name": "L", - "Root": "L:\\" - }, - { - "Credential": { - "Password": "", - "UserName": null - }, - "CurrentLocation": "", - "Description": "", - "DisplayRoot": null, - "MaximumSize": null, - "Name": "F", - "Root": "F:\\" - }, - { - "Credential": { - "Password": "", - "UserName": null - }, - "CurrentLocation": "", - "Description": "", - "DisplayRoot": null, - "MaximumSize": null, - "Name": "G", - "Root": "G:\\" - }, - { - "Credential": { - "Password": "", - "UserName": null - }, - "CurrentLocation": "", - "Description": "", - "DisplayRoot": null, - "MaximumSize": null, - "Name": "H", - "Root": "H:\\" - }, - { - "Credential": { - "Password": "", - "UserName": null - }, - "CurrentLocation": "", - "Description": "", - "DisplayRoot": null, - "MaximumSize": null, - "Name": "I", - "Root": "I:\\" - }, - { - "Credential": { - "Password": "", - "UserName": null - }, - "CurrentLocation": "", - "Description": "", - "DisplayRoot": null, - "MaximumSize": null, - "Name": "J", - "Root": "J:\\" - }, - { - "Credential": { - "Password": "", - "UserName": null - }, - "CurrentLocation": "", - "Description": "", - "DisplayRoot": null, - "MaximumSize": null, - "Name": "K", - "Root": "K:\\" - } - ], - "HelpFile": "System.Management.Automation.dll-Help.xml", - "Home": "C:\\Users\\Joel", - "ImplementingType": "Microsoft.PowerShell.Commands.FileSystemProvider, System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35", - "Module": null, - "ModuleName": "Microsoft.PowerShell.Core", - "Name": "FileSystem", - "PSSnapIn": { - "ApplicationBase": "C:\\Windows\\System32\\WindowsPowerShell\\v1.0", - "AssemblyName": "System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, ProcessorArchitecture=MSIL", - "Description": "This Windows PowerShell snap-in contains cmdlets used to manage components of Windows PowerShell.", - "Formats": [ - "Certificate.format.ps1xml", - "DotNetTypes.format.ps1xml", - "FileSystem.format.ps1xml", - "Help.format.ps1xml", - "HelpV3.format.ps1xml", - "PowerShellCore.format.ps1xml", - "PowerShellTrace.format.ps1xml", - "Registry.format.ps1xml" - ], - "IsDefault": true, - "LogPipelineExecutionDetails": false, - "ModuleName": "System.Management.Automation", - "Name": "Microsoft.PowerShell.Core", - "PSVersion": { - "Build": 16215, - "Major": 5, - "MajorRevision": 0, - "Minor": 1, - "MinorRevision": 1000, - "Revision": 1000 - }, - "Types": [ - "types.ps1xml", - "typesv3.ps1xml" - ], - "Vendor": "Microsoft Corporation", - "Version": { - "Build": 0, - "Major": 3, - "MajorRevision": 0, - "Minor": 0, - "MinorRevision": 0, - "Revision": 0 - } - } - }, - "Root": "C:\\" - }, - "Path": "C:\\Users\\Joel\\Projects\\Jupyter\\Jupyter-PowerShell", - "Provider": { - "Capabilities": 52, - "Description": "", - "Drives": [ - { - "Credential": { - "Password": "", - "UserName": null - }, - "CurrentLocation": "Users\\Joel\\Projects\\Jupyter\\Jupyter-PowerShell", - "Description": "Crucial", - "DisplayRoot": null, - "MaximumSize": null, - "Name": "C", - "Root": "C:\\" - }, - { - "Credential": { - "Password": "", - "UserName": null - }, - "CurrentLocation": "", - "Description": "Samsung", - "DisplayRoot": null, - "MaximumSize": null, - "Name": "D", - "Root": "D:\\" - }, - { - "Credential": { - "Password": "", - "UserName": null - }, - "CurrentLocation": "", - "Description": "SeaGates", - "DisplayRoot": null, - "MaximumSize": null, - "Name": "E", - "Root": "E:\\" - }, - { - "Credential": { - "Password": "", - "UserName": null - }, - "CurrentLocation": "", - "Description": "Seagate Expansion Drive", - "DisplayRoot": null, - "MaximumSize": null, - "Name": "L", - "Root": "L:\\" - }, - { - "Credential": { - "Password": "", - "UserName": null - }, - "CurrentLocation": "", - "Description": "", - "DisplayRoot": null, - "MaximumSize": null, - "Name": "F", - "Root": "F:\\" - }, - { - "Credential": { - "Password": "", - "UserName": null - }, - "CurrentLocation": "", - "Description": "", - "DisplayRoot": null, - "MaximumSize": null, - "Name": "G", - "Root": "G:\\" - }, - { - "Credential": { - "Password": "", - "UserName": null - }, - "CurrentLocation": "", - "Description": "", - "DisplayRoot": null, - "MaximumSize": null, - "Name": "H", - "Root": "H:\\" - }, - { - "Credential": { - "Password": "", - "UserName": null - }, - "CurrentLocation": "", - "Description": "", - "DisplayRoot": null, - "MaximumSize": null, - "Name": "I", - "Root": "I:\\" - }, - { - "Credential": { - "Password": "", - "UserName": null - }, - "CurrentLocation": "", - "Description": "", - "DisplayRoot": null, - "MaximumSize": null, - "Name": "J", - "Root": "J:\\" - }, - { - "Credential": { - "Password": "", - "UserName": null - }, - "CurrentLocation": "", - "Description": "", - "DisplayRoot": null, - "MaximumSize": null, - "Name": "K", - "Root": "K:\\" - } - ], - "HelpFile": "System.Management.Automation.dll-Help.xml", - "Home": "C:\\Users\\Joel", - "ImplementingType": "Microsoft.PowerShell.Commands.FileSystemProvider, System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35", - "Module": null, - "ModuleName": "Microsoft.PowerShell.Core", - "Name": "FileSystem", - "PSSnapIn": { - "ApplicationBase": "C:\\Windows\\System32\\WindowsPowerShell\\v1.0", - "AssemblyName": "System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, ProcessorArchitecture=MSIL", - "Description": "This Windows PowerShell snap-in contains cmdlets used to manage components of Windows PowerShell.", - "Formats": [ - "Certificate.format.ps1xml", - "DotNetTypes.format.ps1xml", - "FileSystem.format.ps1xml", - "Help.format.ps1xml", - "HelpV3.format.ps1xml", - "PowerShellCore.format.ps1xml", - "PowerShellTrace.format.ps1xml", - "Registry.format.ps1xml" - ], - "IsDefault": true, - "LogPipelineExecutionDetails": false, - "ModuleName": "System.Management.Automation", - "Name": "Microsoft.PowerShell.Core", - "PSVersion": { - "Build": 16215, - "Major": 5, - "MajorRevision": 0, - "Minor": 1, - "MinorRevision": 1000, - "Revision": 1000 - }, - "Types": [ - "types.ps1xml", - "typesv3.ps1xml" - ], - "Vendor": "Microsoft Corporation", - "Version": { - "Build": 0, - "Major": 3, - "MajorRevision": 0, - "Minor": 0, - "MinorRevision": 0, - "Revision": 0 - } - } - }, - "ProviderPath": "C:\\Users\\Joel\\Projects\\Jupyter\\Jupyter-PowerShell" - } + "C:\\Users\\Joel\\Projects\\Jupyter\\Jupyter-PowerShell" ] }, "text/plain": [ - "Path \r\n", - "---- \r\n", "C:\\Users\\Joel\\Projects\\Jupyter\\Jupyter-PowerShell" ] }, @@ -371,7 +22,18 @@ } ], "source": [ - "pwd" + "$pwd.Path" + ] + }, + { + "cell_type": "code", + "execution_count": 2, + "metadata": { + "collapsed": true + }, + "outputs": [], + "source": [ + "rm C:\\Users\\Joel\\Projects\\Jupyter\\Jupyter-PowerShell\\Output\\Release\\* -recurse" ] }, { @@ -382,12 +44,16 @@ "\n", "We really just need to `dotnet restore` and `dotnet build` ...\n", "\n", - "But in order to ship something, we need to `publish` it:" + "But in order to ship something, we need to `publish` it.\n", + "\n", + "## Increment the version\n", + "\n", + "I've changed the project files to use the new `--version-suffix` feature:" ] }, { "cell_type": "code", - "execution_count": 1, + "execution_count": 3, "metadata": {}, "outputs": [ { @@ -427,33 +93,19 @@ " PowerShell-Kernel -> C:\\Users\\Joel\\Projects\\Jupyter\\Jupyter-PowerShell\\Output\\Release\\net462\\publish\\" ] }, - "execution_count": 1, + "execution_count": 3, "metadata": {}, "output_type": "execute_result" } ], "source": [ - "dotnet publish -f netcoreapp2.0 -c Release\n", - "dotnet publish -f net462 -c Release" + "dotnet publish -f netcoreapp2.0 -c Release --version-suffix \"-beta-4\"\n", + "dotnet publish -f net462 -c Release --version-suffix \"-beta-4\"" ] }, { "cell_type": "code", - "execution_count": 2, - "metadata": {}, - "outputs": [], - "source": [ - "mkdir Output\\Release\\Jupyter-PowerShell -force | sl\n", - "move-item ..\\net462\\publish PowerShell-Full\n", - "move-item ..\\netcoreapp2.0\\publish PowerShell-Core\n", - "copy-item ..\\..\\..\\Install.ps1 .\n", - "cd ..\n", - "Microsoft.PowerShell.Archive\\Compress-Archive Jupyter-PowerShell Jupyter-PowerShell.zip" - ] - }, - { - "cell_type": "code", - "execution_count": 3, + "execution_count": 4, "metadata": {}, "outputs": [ { @@ -484,18 +136,24 @@ "\r\n", "Mode LastWriteTime Length Name \r\n", "---- ------------- ------ ---- \r\n", - "d----- 6/29/2017 10:36 PM Jupyter-PowerShell \r\n", - "d----- 6/29/2017 10:36 PM net462 \r\n", - "d----- 6/29/2017 10:36 PM netcoreapp2.0 \r\n", - "-a---- 6/29/2017 10:36 PM 14567990 Jupyter-PowerShell.zip" + "d----- 6/30/2017 12:41 AM Jupyter-PowerShell \r\n", + "d----- 6/30/2017 12:41 AM net462 \r\n", + "d----- 6/30/2017 12:41 AM netcoreapp2.0 \r\n", + "-a---- 6/30/2017 12:41 AM 14567968 Jupyter-PowerShell.zip" ] }, - "execution_count": 3, + "execution_count": 4, "metadata": {}, "output_type": "execute_result" } ], "source": [ + "mkdir Output\\Release\\Jupyter-PowerShell -force | convert-path | Set-Location\n", + "move-item ..\\net462\\publish PowerShell-Full\n", + "move-item ..\\netcoreapp2.0\\publish PowerShell-Core\n", + "copy-item ..\\..\\..\\Install.ps1 .\n", + "cd ..\n", + "Microsoft.PowerShell.Archive\\Compress-Archive Jupyter-PowerShell Jupyter-PowerShell.zip\n", "ls" ] }