Skip to content

Bring vs17.0 up-to-date with main#6367

Merged
benvillalobos merged 6 commits intodotnet:vs17.0from
Forgind:master
Apr 22, 2021
Merged

Bring vs17.0 up-to-date with main#6367
benvillalobos merged 6 commits intodotnet:vs17.0from
Forgind:master

Conversation

@Forgind
Copy link
Copy Markdown
Contributor

@Forgind Forgind commented Apr 22, 2021

Adds newer commits

@rainersigwald

KirillOsenkov and others added 6 commits April 20, 2021 13:47
* Make GenerateResource look up resgen.exe in 10.0 SDK

GenerateResource tests were failing when only VS 2019 and 10.0 Windows SDK is installed. I suspect the task itself would also fail if run with ExecuteAsTool.

The problem is that we started look up with .NET 4.6.1 and lower. Start lookup with .NET 4.8 instead and fallback down the chain. This should still find all earlier SDKs too.

Introduce latest versions of Visual Studio too.

* Rollback some changes to VersionLatest.

* Set the SdkToolsPath to framework 4.8

This actually fixes the unit-tests on a machine with only SDK 10.0 installed.
Co-authored-by: Forgind <Forgind@users.noreply.github.com>
Co-authored-by: Rainer Sigwald <raines@microsoft.com>
@Forgind Forgind added the merge-when-branch-open PRs that are approved, except that there is a problem that means we are not merging stuff right now. label Apr 22, 2021
@benvillalobos benvillalobos merged commit 82dd8df into dotnet:vs17.0 Apr 22, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merge-when-branch-open PRs that are approved, except that there is a problem that means we are not merging stuff right now.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants