Skip to content

WIP: Update template to use PSL 5.1.0 #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 25, 2019
Merged

WIP: Update template to use PSL 5.1.0 #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d05caa1
WIP: Update template to use PSL 5.1.0
rkeithhill Aug 10, 2019
e144233
Update all references to 5.1.1 to 5.1.0
rkeithhill Aug 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/5/PowerShellStandard.Library.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>PowerShellStandard.Library</id>
<version>5.1.1</version>
<version>5.1.0</version>
<title>PowerShellStandard.Library</title>
<authors>Microsoft</authors>
<owners>Microsoft,PowerShellTeam</owners>
Expand Down
2 changes: 1 addition & 1 deletion src/5/System.Management.Automation-lib.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<AssemblyOriginatorKeyFile>..\signing\visualstudiopublic.snk</AssemblyOriginatorKeyFile>
<AssemblyName>System.Management.Automation</AssemblyName>
<AssemblyVersion>3.0.0</AssemblyVersion>
<FileVersion>5.1.1</FileVersion>
<FileVersion>5.1.0</FileVersion>
<DelaySign>True</DelaySign>
<DefineConstants>RUNTIME_SERIALIZATION</DefineConstants>
<NuspecFile>./PowershellStandard.Library.nuspec</NuspecFile>
Expand Down
2 changes: 1 addition & 1 deletion ....PowerShell.Standard.Module.Template/Microsoft.PowerShell.Standard.Module.Template.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
<id>Microsoft.PowerShell.Standard.Module.Template</id>
<version>0.1.4</version>
<version>0.1.5</version>
<title>PowerShell Standard module</title>
<authors>Microsoft</authors>
<owners>Microsoft,PowerShellTeam</owners>
Expand Down
6 changes: 3 additions & 3 deletions ...ule.Template/Microsoft.PowerShell.Standard.Module.Template/.template.config/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@
"PowerShellStandardVersion":{
"type": "parameter",
"datatype":"choice",
"defaultValue": "5.1.0-preview-06",
"defaultValue": "5.1.0",
"choices": [
{
"choice": "5.1.0-preview-06",
"choice": "5.1.0",
"description": "PowerShell Standard 5.1"
},
{
"choice": "3.0.0-preview-02",
"description": "PowerShell Standard 3.0"
}
],
"replaces": "5.1.0-preview-06"
"replaces": "5.1.0"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure what this does exactly but figured it had to be changed to remove the -preview-06 ref.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is the right call - basically, it will replace instances of what's in replaces with the choice based on what flags are used when dotnet new is called.

},
"skipRestore": {
"type": "parameter",
Expand Down
2 changes: 1 addition & 1 deletion ....PowerShell.Standard.Module.Template/Microsoft.PowerShell.Standard.Module.Template.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="PowerShellStandard.Library" Version="5.1.1">
<PackageReference Include="PowerShellStandard.Library" Version="5.1.0">
<PrivateAssets>All</PrivateAssets>
</PackageReference>

Expand Down
2 changes: 1 addition & 1 deletion ...ft.PowerShell.Standard.Module.Template/Microsoft.PowerShell.Standard.Module.Template.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Author = 'Unknown'
CompanyName = 'Unknown'

# Copyright statement for this module
Copyright = '(c) 2018 Unknown. All rights reserved.'
Copyright = '(c) 2019 Unknown. All rights reserved.'

# Description of the functionality provided by this module
# Description = ''
Expand Down
16 changes: 8 additions & 8 deletions src/dotnetTemplate/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

A `dotnet new` template that creates an example PowerShell C# module that uses PowerShellStandard.

```
```powershell
dotnet new psmodule
```

Expand All @@ -12,7 +12,7 @@ To use the template, you must first install it so that it is recognized in `dotn

### From nuget.org

```
```powershell
dotnet new -i Microsoft.PowerShell.Standard.Module.Template
```

Expand All @@ -33,7 +33,7 @@ Now checkout the [usage](#usage).

Once the template is installed, you will see it in your template list:

```
```text
PS> dotnet new -l

Usage: new [options]
Expand Down Expand Up @@ -75,7 +75,7 @@ MVC ViewStart viewstart

To get more details, add the `-h` flag:

```
```text
PS > dotnet new psmodule -h
Usage: new [options]

Expand All @@ -95,9 +95,9 @@ PowerShell Standard Module (C#)
Author: Microsoft Corporation
Options:
-v|--powershell-standard-version
5.1.1 - PowerShell Standard 5.1.1
5.1.0 - PowerShell Standard 5.1.0
3.0.0-preview-02 - PowerShell Standard 3.0
Default: 5.1.1
Default: 5.1.0

--no-restore If specified, skips the automatic restore of the project on create.
bool - Optional
Expand All @@ -106,7 +106,7 @@ Options:

To create a template using the defaults:

```
```text
> dotnet new psmodule
The template "PowerShell Standard Module" was created successfully.

Expand All @@ -124,7 +124,7 @@ Notice that it restores automatically.

You can optionally specify PowerShell Standard V3 by running:

```
```text
dotnet new psmodule --powershell-standard-version 3.0.0-preview-02
```

Expand Down
4 changes: 2 additions & 2 deletions tools/releaseBuild/signing.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
dest="__OUTPATHROOT__\release\out\Microsoft.PowerShell.Standard.Module.Template.0.1.4.nupkg" />
<file src="__INPATHROOT__\release\out\PowerShellStandard.Library.3.0.0-preview-02.nupkg" signType="CP-401405"
dest="__OUTPATHROOT__\release\out\PowerShellStandard.Library.3.0.0-preview-02.nupkg" />
<file src="__INPATHROOT__\release\out\PowerShellStandard.Library.5.1.1.nupkg" signType="CP-401405"
dest="__OUTPATHROOT__\release\out\PowerShellStandard.Library.5.1.1.nupkg" />
<file src="__INPATHROOT__\release\out\PowerShellStandard.Library.5.1.0.nupkg" signType="CP-401405"
dest="__OUTPATHROOT__\release\out\PowerShellStandard.Library.5.1.0.nupkg" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JamesWTruher can you speak to this change? Why does the signing.xml have 5.1.1?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JamesWTruher @TylerLeonhardt Any chance of getting this PR moved through? It would be nice if the template folks installed with dotnet worked better. :-)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yah - sorry, I thought I had pushed 5.1.1 months ago. I'll make this happen

</job>
</SignConfigXML>