Commit graph

1095 commits

Author SHA1 Message Date
Marc Paine
60af8af7c4 Update the minimum required verison in the installer UI to list 17.0 as that's what we're officially supporting (even if we're not going to block 16.11) 2021-07-19 11:54:13 -07:00
Marc Paine
9cff60c3a6
Update GenerateBundledVersions.targets 2021-07-16 14:00:37 -07:00
Jason Zhai
76be4f93ad Merge branch 'release/5.0.4xx' into main 2021-07-14 23:28:19 -07:00
Devendar Reddy Adulla
2ec8242666
Merge pull request #11087 from dotnet/dev/dreddy/updatedesktopversion
Update WindowsDesktop servicing versions to 5.0.8
2021-07-14 13:47:54 -07:00
John Luo
47d09acf67
Update aspnetcore 3.1 & 5.0 template versions (#11086) 2021-07-14 13:23:33 -07:00
Devendar Reddy A
67fe759ed4 Update servcing versions 2021-07-08 09:52:34 -07:00
Larry Ewing
20e58082fa
Merge pull request #11060 from dotnet/darc-main-0a8e7e9b-f4e6-4c7d-85c7-02e9934e42ec
[main] Update dependencies from dotnet/sdk
2021-07-07 21:31:08 -05:00
Larry Ewing
c2d147c2c2 Add emscripten manifest 2021-07-07 09:35:42 -07:00
Jacques Eloff
ef74b6ca71
Ensure finalizer doesn't remove workloads during upgrades (#10999) 2021-07-07 08:04:20 -07:00
Marc Paine
4ed27616e4
Update GenerateBundledVersions.targets 2021-07-06 11:35:05 -07:00
kasperk81
b02f23cc21 Adapt to latest crossgen change 2021-06-29 23:20:34 +00:00
Marc Paine
60272f2aa6
Merge pull request #10631 from kasperk81/patch-2
Fix crossgen PlatformAssemblyPaths for rzc
2021-06-29 10:45:05 -07:00
Marc Paine
42045b06c1
Merge branch 'main' into marcpopMSFT-preview6flow 2021-06-25 16:03:19 -07:00
Marc Paine
e1265dbf74 Merge remote-tracking branch 'origin/release/6.0.1xx-preview6' into marcpopMSFT-preview6flow 2021-06-23 15:15:34 -07:00
Marc Paine
3b52bed9cf
Merge pull request #10837 from dotnet/RussKie-patch-1
Update Windows Desktop to 3.1.16 / 5.0.7
2021-06-23 15:12:14 -07:00
Marc Paine
1f024a0e0d
Merge pull request #10886 from dotnet/marcpopMSFT-CR
Update some older copyright strings to the correct MIT copyright.
2021-06-23 14:41:02 -07:00
Marc Paine
6eead57b89
Update GenerateBundledVersions.targets 2021-06-22 13:19:03 -07:00
Marc Paine
cf1c368d33
Merge branch 'main' into RussKie-patch-1 2021-06-22 13:16:56 -07:00
Pranav K
66e7c4cf3b
Modify GenerateLayout to work with runtime configs that contain more than one runtime (#10901) (#10947) 2021-06-22 19:25:10 +00:00
Marc Paine
85dd00be9d Update some older copyright strings to the correct MIT copyright. 2021-06-21 16:29:03 -07:00
Sarah Oslund
4d465d9c75
Merge pull request #10909 from jonathanpeppers/maui-workload
Add .NET MAUI workload manifest
2021-06-21 08:55:19 -07:00
Daniel Plaisted
556cf1f0f3 Fix call to DownloadFile 2021-06-18 15:09:20 -07:00
Daniel Plaisted
f67f6ba948 Merge 5.0.4xx into 6.0.1xx-preview6 2021-06-18 12:05:51 -07:00
Jonathan Peppers
507c44b7bf Add .NET MAUI workload manifest
Context: https://github.com/dotnet/maui/pull/603

After building with `.\build.cmd -pack -publish`, I could install the
workload:

    .\artifacts\bin\redist\Debug\dotnet\dotnet.exe workload install maui --verbosity diag
    ...
    Successfully installed workload(s) maui.

Next, I setup a `global.json` with `6.0.100-dev` and tried:

    .\artifacts\bin\redist\Debug\dotnet\dotnet.exe new maui

I was able to build and run the app, after some minor tweaks to the
template.
2021-06-17 11:39:16 -05:00
Pranav K
97675dbc5a
Modify GenerateLayout to work with runtime configs that contain more than one runtime (#10901) 2021-06-17 09:36:05 -07:00
dotnet-bot
303760f056 Merge in 'release/5.0.3xx' changes 2021-06-15 20:46:36 +00:00
Ryland Alaniz
d904dab19d Merged PR 15831: WindowsDesktop NET5 ARM64: Include WindowsDesktop ARM64 in the Installer (internal)
This is a cherry-pick of https://github.com/dotnet/installer/pull/10699 (which targets the public Installer repo, branch release/5.0.3xx) to the internal Installer repo, branch internal/release/5.0.3xx.

The public PR has been approved for 5.0.8 servicing.
2021-06-15 17:53:29 +00:00
Daniel Plaisted
ebfaa67375 Merge release/5.0.2xx into release/5.0.3xx 2021-06-15 10:37:05 -07:00
Daniel Plaisted
293c06da86
Merge pull request #10885 from dsplaisted/win-sdk-fe-5.0.2xx
Update Windows targeting information
2021-06-15 07:43:51 -07:00
William Godbe
9ad65fcd08
Decrement 2.1 patch version (#10897) 2021-06-14 14:31:26 -07:00
William Godbe
aae22b05c4
Decrement 2.1 patch version
To account for 2.1 not building this month
2021-06-14 13:24:27 -07:00
Manish Godse
959245b50a CR feedback 2021-06-13 17:47:24 -07:00
Manish Godse
1013c2b24d fix musl builds 2021-06-12 01:18:24 -07:00
Manish Godse
38a2c60199 Fix cross builds. 2021-06-11 22:54:54 -07:00
Manish Godse
d47b00d38d fix naming
Ah case sensitivity.
2021-06-11 22:10:31 -07:00
Manish Godse
ed9c92df3a propagate targetArch to crossgen2 2021-06-11 21:25:25 -07:00
Manish Godse
88b8fc6b33 replace crossgen with crossgen2
crossgen is now defunct. This is validated on windows x64. More work will be required to get it to work across OS/arch.
2021-06-11 21:11:16 -07:00
Daniel Plaisted
ca77109054 Add Windows targeting information in new format, bump package versions, add 20348 as targetable version 2021-06-11 10:58:45 -07:00
Sarah Oslund
41ef6e2cac Adding SDK manifests vs package 2021-06-09 12:57:17 -07:00
Anirudh Agnihotry
c7a34b1f74
update versions (#10833) 2021-06-09 09:10:52 -07:00
John Luo
5269cd79bb
Update aspnetcore 3.1 & 5.0 template versions (#10823)
* Update aspnetcore 3.1 & 5.0 template versions

* Update bundled versions
2021-06-08 12:37:16 -07:00
Igor Velikorossov
884c2af9e7
Update GenerateBundledVersions.targets
Update Windows Desktop to 3.1.16 / 5.0.7
2021-06-03 09:05:04 +10:00
Sarah Oslund
3ab5d1c2bf Merge remote-tracking branch 'upstream/release/6.0.1xx-preview5' into HEAD 2021-06-01 15:48:42 -07:00
Sarah Oslund
ef4abb849d Make baseline manifests lowercase 2021-05-27 09:04:12 -07:00
Matt Mitchell
e58843bebc
Remove Copy Blobs To Latest functionality and clean up some publishing (#10773)
- The stage has been subsumed by the aka.ms functionality and now can be removed.
- Clean up dead properties and functionality no longer needed because of it.
- Removing publishing of nupkg files as blobs. This used to be useful before because we often needed to get at the nupkgs in a flat, easy to copy format for pushing to the VS feed. But now the staging pipeline takes care of this, and moreover the use of post-build signing means that these files are not useful straight out of the build anyway. This should reduce publishing time and some post-build signing time.

Remove nupkg install in publishing.props
2021-05-26 15:13:19 -07:00
Josh Soref
b6273e1ec7 spelling: upgradability
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
2021-05-26 05:16:13 -04:00
Josh Soref
d7f6b149d8 spelling: transform
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
2021-05-26 05:16:13 -04:00
Josh Soref
0996744cc0 spelling: implicit
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
2021-05-26 05:16:13 -04:00
Sarah Oslund
f63f994967 Remove VSRedistCommonNetCoreTargetingPackx6450PackageVersion property 2021-05-21 11:20:38 -07:00
Sarah Oslund
f2c71cd32d Merge remote-tracking branch 'internal/release/5.0.2xx' into Internal502To503 2021-05-21 10:59:41 -07:00