Skip to content
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.

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

Microsoft/users/aujensen/vs2019 vs task #9273

Merged
merged 8 commits into from
Jan 11, 2019

Conversation

austin-jensen
Copy link
Contributor

Added support for msbuild task and vsbuild task for visual studio 2019

}
} catch {
Write-Verbose ($_ | Out-String)
$script:visualStudioCache['6.0'] = $null
Copy link
Contributor

Choose a reason for hiding this comment

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

16.0 instead of 6.0

@TingluoHuang
Copy link
Contributor

@austin-jensen where is your task.json change that consume this common library change?

@@ -227,6 +237,63 @@ function Get-VisualStudio_15_0 {
}
}

function Get-VisualStudio_16_0 {
Copy link
Contributor

Choose a reason for hiding this comment

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

consider parameterize existing function

@@ -49,6 +49,7 @@ try {
$msBuildVersion = $null;
switch ("$vsVersion") {
'' { $msBuildVersion = '14.0' ; break } # VS wasn't found. Attempt to find MSBuild 14.0 or lower.
'16.0' { $msBuildVersion = '16.0' ; break }
Copy link
Contributor

Choose a reason for hiding this comment

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

make sure to bump the version for any tasks that consume the msbuildhelpers module

@jimmylewis
Copy link

The VSTestV2 task also needs to be updated to detect/support VS2019. Will that be added to this PR, or in a separate one?

@austin-jensen
Copy link
Contributor Author

@jimmylewis That will be done separately, as a lot of people are currently complaining about not being able to build with visual studio 2019. So we are trying to get the msbuild and vsbuild tasks out quickly

[System.Reflection.Assembly]$msUtilities = $null
if (($Version -eq "15.0" -or !$Version) -and # !$Version indicates "latest"
if (($Version -eq "16.0" -or !$Version) -and # !$Version indicates "latest"
($visualStudio16 = Get-VisualStudio_16_0) -and
Copy link
Contributor

Choose a reason for hiding this comment

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

Get-VisualStudio_16_0?

$msUtilities = [System.Reflection.Assembly]::LoadFrom($msbuildUtilitiesPath)
}
}
elseif (($Version -eq "15.0" -or !$Version) -and # !$Version indicates "latest"
($visualStudio15 = Get-VisualStudio_15_0) -and
Copy link
Contributor

Choose a reason for hiding this comment

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

Get-VisualStudio_15_0?

@@ -193,16 +206,16 @@ function Get-VisualStudio_15_0 {
$null = $output.AppendLine($_)
}
}
$script:visualStudioCache['15.0'] = (ConvertFrom-Json -InputObject $output.ToString()) |
$script:visualStudioCache["$MajorVersion.0"] = (ConvertFrom-Json -InputObject $output.ToString()) |
Copy link
Contributor

Choose a reason for hiding this comment

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

not sure whether you can just use visualStudioCache[$MajorVersion] as key, do we have to do "$MajorVersion.0"?

@@ -11,7 +11,7 @@
"author": "Microsoft Corporation",
"version": {
"Major": 1,
"Minor": 120,
"Minor": 121,
Copy link
Contributor

Choose a reason for hiding this comment

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

i think it should be the milestone number 1.146.0

@@ -330,6 +330,26 @@ function Locate-SqlPackageInVS_15_0()
return $null, 0
}

function Locate-SqlPackageInVS_16_0()
{
$vs16 = Get-VisualStudio_16_0
Copy link
Contributor

Choose a reason for hiding this comment

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

i would not change this task in this PR, send email to the owner of this task, let them deal with it.

@@ -15,7 +15,7 @@
"author": "Microsoft Corporation",
"version": {
"Major": 1,
"Minor": 3,
"Minor": 2,
Copy link
Contributor

Choose a reason for hiding this comment

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

ask task owner.

@@ -11,8 +11,8 @@
"author": "Microsoft Corporation",
"version": {
"Major": 1,
"Minor": 126,
"Patch": 2
"Minor": 127,
Copy link
Contributor

Choose a reason for hiding this comment

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

1.146.0

@@ -11,8 +11,8 @@
"author": "Microsoft Corporation",
"version": {
"Major": 1,
"Minor": 143,
"Patch": 1
"Minor": 144,
Copy link
Contributor

Choose a reason for hiding this comment

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

let task author change this.

@@ -11,8 +11,8 @@
"author": "Microsoft Corporation",
"version": {
"Major": 2,
"Minor": 142,
"Patch": 2
"Minor": 143,
Copy link
Contributor

Choose a reason for hiding this comment

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

let task author change this.

@TingluoHuang
Copy link
Contributor

i would only include change to VSBuild/Msbuild task, and let other task author know they need to react.

@austin-jensen austin-jensen force-pushed the Microsoft/users/aujensen/VS2019VSTask branch from bb71732 to 4cbbcc5 Compare January 10, 2019 21:16
@austin-jensen austin-jensen merged commit 2445308 into master Jan 11, 2019
austin-jensen added a commit that referenced this pull request Jan 11, 2019
VS2019 support for VSBuild and MSBuild tasks
austin-jensen added a commit that referenced this pull request Jan 11, 2019
VS2019 support for VSBuild and MSBuild tasks
austin-jensen added a commit that referenced this pull request Jan 11, 2019
VS2019 support for VSBuild and MSBuild tasks
austin-jensen added a commit that referenced this pull request Jan 14, 2019
VS2019 support for VSBuild and MSBuild tasks
austin-jensen added a commit that referenced this pull request Jan 24, 2019
VS2019 support for VSBuild and MSBuild tasks
@mika76
Copy link

mika76 commented Sep 6, 2019

Any news here? I'm trying to build with 2019 build tools on a TFS 2015 on site installer...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants