Skip to content

Update versions for 1.18.0 Release #1174

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 7 commits into from
Mar 14, 2019
Merged

Update versions for 1.18.0 Release #1174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
393254d
Drop back to 2.1.4 for sdk in container
JamesWTruher Mar 13, 2019
7956904
Don't take input for building, the release tag is never used
JamesWTruher Mar 13, 2019
db129f4
Push version to 1.18.0
JamesWTruher Mar 13, 2019
3a39dcc
add param statement in vstsbuild script
JamesWTruher Mar 13, 2019
f74b28f
add dummy ReleaseTag
JamesWTruher Mar 13, 2019
dd353a0
Move up to sdk 2.1.9
JamesWTruher Mar 14, 2019
227e14c
Revert "Move up to sdk 2.1.9"
JamesWTruher Mar 14, 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 Engine/Engine.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<VersionPrefix>1.17.1</VersionPrefix>
<VersionPrefix>1.18.0</VersionPrefix>
<TargetFrameworks>netstandard2.0;net452</TargetFrameworks>
<AssemblyName>Microsoft.Windows.PowerShell.ScriptAnalyzer</AssemblyName>
<PackageId>Engine</PackageId>
Expand Down
2 changes: 1 addition & 1 deletion Engine/PSScriptAnalyzer.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Author = 'Microsoft Corporation'
RootModule = 'PSScriptAnalyzer.psm1'

# Version number of this module.
ModuleVersion = '1.17.1'
ModuleVersion = '1.18.0'

# ID used to uniquely identify this module
GUID = 'd6245802-193d-4068-a631-8863a4342a18'
Expand Down
2 changes: 1 addition & 1 deletion Rules/Rules.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<VersionPrefix>1.17.1</VersionPrefix>
<VersionPrefix>1.18.0</VersionPrefix>
<TargetFrameworks>netstandard2.0;net452</TargetFrameworks>
<AssemblyName>Microsoft.Windows.PowerShell.ScriptAnalyzer.BuiltinRules</AssemblyName>
<PackageId>Rules</PackageId>
Expand Down
2 changes: 1 addition & 1 deletion tools/releaseBuild/Image/DockerFile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ RUN Import-Module PackageManagement; `
Install-ChocolateyPackage -PackageName nuget.commandline -Executable nuget.exe -Cleanup; `
Install-Module -Force -Name platyPS; `
Invoke-WebRequest -Uri https://raw.githubusercontent.com/dotnet/cli/master/scripts/obtain/dotnet-install.ps1 -outfile C:/dotnet-install.ps1; `
C:/dotnet-install.ps1 -Channel Release -Version 2.2.3; `
C:/dotnet-install.ps1 -Channel Release -Version 2.1.4; `
Copy link
Collaborator

@bergmeister bergmeister Mar 14, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

Have you tried using the latest patched version 2.1.9? Maybe it was an issue of the 2.2 version not containing the 2.1 runtime that was needed for something?

Suggested change
C:/dotnet-install.ps1 -Channel Release -Version 2.1.4; `
C:/dotnet-install.ps1 -Channel Release -Version 2.1.9; `

Copy link
Contributor Author

Choose a reason for hiding this comment

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

sadly, that build fails as well. I'm not too fussed about this, as it's just the build tool which is used in the docker image. I can tear this apart after this release.

Add-Path C:/Users/ContainerAdministrator/AppData/Local/Microsoft/dotnet;

RUN Import-Module ./containerFiles/dockerInstall.psm1; `
Expand Down
11 changes: 2 additions & 9 deletions tools/releaseBuild/vstsbuild.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
[cmdletbinding()]
param(
[Parameter(Mandatory=$true,Position=0)]
[ValidatePattern("^v\d+\.\d+\.\d+(-\w+(\.\d+)?)?$")]
[string]$ReleaseTag
)
param ( )

Begin
{
Expand Down Expand Up @@ -54,13 +50,10 @@ End {
Write-Verbose "Starting build at $resolvedRepoRoot ..." -Verbose
Clear-VstsTaskState

$buildParameters = @{
ReleaseTag = $ReleaseTag
}
$buildArgs = @{
RepoPath = $resolvedRepoRoot
BuildJsonPath = './tools/releaseBuild/build.json'
Parameters = $buildParameters
Parameters = @{ ReleaseTag = "unused" } # not needed for PSSA
AdditionalFiles = $AdditionalFiles
Name = "win7-x64"
}
Expand Down