Commit graph

20619 commits

Author SHA1 Message Date
Daniel Plaisted
f67f6ba948 Merge 5.0.4xx into 6.0.1xx-preview6 2021-06-18 12:05:51 -07:00
dotnet-maestro[bot]
c2b931e748
Update dependencies from https://github.com/dotnet/arcade build 20210617.1 (#10918)
[main] Update dependencies from dotnet/arcade
2021-06-18 18:47:40 +00:00
dotnet-maestro[bot]
35404aed85
Update dependencies from https://github.com/dotnet/sdk build 20210617.28 (#10915)
[release/5.0.4xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Build: from 16.11.0-preview-21309-01 to 16.11.0-preview-21317-10 (parent: Microsoft.NET.Sdk)
2021-06-18 18:22:28 +00:00
dotnet-maestro[bot]
17f553b463
Update dependencies from https://github.com/dotnet/sdk build 20210618.6 (#10919)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.7.21318.1 to 6.0.0-preview.7.21318.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.7.21318.1 to 6.0.0-preview.7.21318.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.7.21318.1 to 6.0.0-preview.7.21318.2 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.7.21318.1 to 6.0.0-preview.7.21318.2 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 6.0.0-preview.7.21318.1 to 6.0.0-preview.7.21318.2 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 6.0.0-preview.7.21318.1 to 6.0.0-preview.7.21318.2 (parent: Microsoft.NET.Sdk)
2021-06-18 18:14:58 +00:00
dotnet-maestro[bot]
ac6c92de8f
[main] Update dependencies from dotnet/sdk (#10856)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-preview.6.21305.3 to 6.0.0-preview.7.21316.6 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-preview.6.21305.3 to 6.0.0-preview.7.21316.6 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-preview.6.21306.1 to 6.0.0-preview.7.21318.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 6.0.0-preview.6.21306.1 to 6.0.0-preview.7.21318.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-preview.6.21306.1 to 6.0.0-preview.7.21318.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-preview.6.21306.1 to 6.0.0-preview.7.21318.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-preview.6.21306.1 to 6.0.0-preview.7.21318.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 6.0.0-preview.6.21306.1 to 6.0.0-preview.7.21318.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.6.21306.3 to 6.0.0-preview.7.21318.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.6.21306.3 to 6.0.0-preview.7.21318.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.6.21306.3 to 6.0.0-preview.7.21318.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.6.21306.3 to 6.0.0-preview.7.21318.1 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 6.0.0-preview.6.21306.3 to 6.0.0-preview.7.21318.1 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 6.0.0-preview.6.21306.3 to 6.0.0-preview.7.21318.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-preview.6.21304.3 to 6.0.100-preview.7.21317.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.6.21305.3 to 6.0.0-preview.7.21316.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-preview.6.21278.2 to 6.0.0-preview.7.21316.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.6.21305.3 to 6.0.0-preview.7.21316.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-preview.6.21305.2 to 6.0.0-preview.7.21316.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.FSharp.Compiler: from 11.4.2-beta.21262.7 to 11.4.2-beta.21310.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.ILLink.Tasks: from 6.0.100-preview.6.21304.2 to 6.0.100-preview.6.21317.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 4.0.0-1.21304.5 to 4.0.0-2.21317.30 (parent: Microsoft.NET.Sdk)
  - Microsoft.Build: from 17.0.0-preview-21304-01 to 17.0.0-preview-21317-11 (parent: Microsoft.NET.Sdk)
2021-06-18 17:02:54 +00:00
dotnet-maestro[bot]
02afcef002
Update dependencies from https://github.com/dotnet/arcade build 20210616.3 (#10908)
[main] Update dependencies from dotnet/arcade
2021-06-18 07:27:27 +00:00
Daniel Plaisted
83540c0479
Merge pull request #10914 from manodasanW/patch-3
Update Windows SDK projection
2021-06-17 21:48:26 -07:00
Manodasan Wignarajah
bdf6ad25b0
Update Windows SDK projection 2021-06-17 19:03:08 -07:00
dotnet-maestro[bot]
45ece8c72d
Update dependencies from https://github.com/dotnet/test-templates build 20210617.1 (#10910)
[main] Update dependencies from dotnet/test-templates
2021-06-18 00:44:11 +00:00
dotnet-maestro[bot]
a22d1c0932
[release/5.0.4xx] Update dependencies from dotnet/sdk (#10911)
[release/5.0.4xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Net.Compilers.Toolset: from 3.11.0-2.21311.1 to 3.11.0-2.21316.5 (parent: Microsoft.NET.Sdk)
2021-06-18 00:37:32 +00: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-maestro[bot]
0cc341a82a
Update dependencies from https://github.com/dotnet/sdk build 20210616.8 (#10905)
[release/5.0.4xx] Update dependencies from dotnet/sdk
2021-06-16 23:32:51 +00:00
Daniel Plaisted
e270fa3f7a
Merge pull request #10902 from dsplaisted/merge-5.0.3xx-to-5.0.4xx
Merge 5.0.3xx to 5.0.4xx
2021-06-16 11:27:52 -07:00
Daniel Plaisted
aa378e8541 Merge release/5.0.3xx into release/5.0.4xx 2021-06-15 15:52:36 -07:00
dotnet-maestro[bot]
8f09936962
Update dependencies from https://github.com/dotnet/arcade build 20210614.1 (#10899)
[main] Update dependencies from dotnet/arcade
- Coherency Updates:
  - XliffTasks: from 1.0.0-beta.21305.1 to 1.0.0-beta.21312.1 (parent: Microsoft.DotNet.Arcade.Sdk)
2021-06-15 21:34:17 +00:00
Daniel Plaisted
ca29031b14
Merge pull request #10900 from dsplaisted/merge-5.0.2xx-to-5.0.3xx
Merge 5.0.2xx to 5.0.3xx
2021-06-15 13:45:27 -07: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
dotnet-maestro[bot]
f42d69c79d
Update dependencies from https://github.com/dotnet/test-templates build 20210614.1 (#10892)
[main] Update dependencies from dotnet/test-templates
2021-06-15 03:42:35 +00:00
William Li
3bd0d468c0
Merge pull request #10898 from dotnet/wtgodbe/50321patch
Decrement 2.1 patch version
2021-06-14 15:32: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
dotnet-maestro[bot]
f580d5e9e9
Update dependencies from https://github.com/dotnet/sdk build 20210614.7 (#10894)
[release/5.0.4xx] Update dependencies from dotnet/sdk
2021-06-14 18:33:27 +00:00
Manish Godse
abb57b4610
Merge pull request #10891 from dotnet/usecg2
remove superfluous OSName param
2021-06-13 23:26:59 -07:00
Manish Godse
7d378d6998 fix ctrl-x error (removed an extra ') 2021-06-13 21:32:08 -07:00
Manish Godse
7c327e560f remove superfluous OSName param 2021-06-13 20:30:41 -07:00
Manish Godse
69cdb64f8a
Merge pull request #10888 from dotnet/usecg2
Switch installer to use crossgen2 for ReadyToRun
2021-06-13 20:21:56 -07:00
Manish Godse
959245b50a CR feedback 2021-06-13 17:47:24 -07:00
dotnet-maestro[bot]
222595ecf2
Update dependencies from https://github.com/dotnet/sdk build 20210612.3 (#10890)
[release/5.0.4xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Net.Compilers.Toolset: from 3.11.0-2.21310.17 to 3.11.0-2.21311.1 (parent: Microsoft.NET.Sdk)
2021-06-12 15:34:25 +00:00
dotnet-maestro[bot]
8b2a65bbe4
Update dependencies from https://github.com/dotnet/arcade build 20210611.3 (#10889)
[main] Update dependencies from dotnet/arcade
- Coherency Updates:
  - Microsoft.SourceLink.GitHub: from 1.1.0-beta-21228-01 to 1.1.0-beta-21309-01 (parent: Microsoft.DotNet.Arcade.Sdk)
  - XliffTasks: from 1.0.0-beta.21303.1 to 1.0.0-beta.21305.1 (parent: Microsoft.DotNet.Arcade.Sdk)
2021-06-12 12:58:31 +00:00
Manish Godse
bc6490c598 fix musl built on alpine 2021-06-12 01:55:58 -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
39d41c1eb2 Revert to Windows SDK package versions that are currently published 2021-06-11 12:32:36 -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
dotnet-maestro[bot]
d273c6d195
Update dependencies from https://github.com/dotnet/sdk build 20210611.6 (#10884)
[release/5.0.4xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Net.Compilers.Toolset: from 3.11.0-2.21302.15 to 3.11.0-2.21310.17 (parent: Microsoft.NET.Sdk)
2021-06-11 16:15:27 +00:00
dotnet-maestro[bot]
6352b64462
Update dependencies from https://github.com/dotnet/sdk build 20210610.17 (#10881)
[release/5.0.4xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.NET.ILLink.Tasks: from 5.0.0-rtm.21221.2 to 5.0.0-rtm.21310.1 (parent: Microsoft.NET.Sdk)
2021-06-10 22:36:57 +00:00
dotnet-maestro[bot]
5db6946a67
Update dependencies from https://github.com/dotnet/sdk build 20210610.10 (#10880)
[release/5.0.4xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Build: from 16.11.0-preview-21308-05 to 16.11.0-preview-21309-01 (parent: Microsoft.NET.Sdk)
2021-06-10 16:26:32 +00:00
dotnet-maestro[bot]
96b93222f7
Update dependencies from https://github.com/dotnet/sdk build 20210610.3 (#10879)
[release/5.0.4xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Build: from 16.11.0-preview-21305-01 to 16.11.0-preview-21308-05 (parent: Microsoft.NET.Sdk)
2021-06-10 11:00:15 +00:00
dotnet-maestro[bot]
a5ca14075b
Update dependencies from https://github.com/dotnet/test-templates build 20210609.1 (#10875)
[main] Update dependencies from dotnet/test-templates
2021-06-09 21:43:11 +00:00
Sarah Oslund
9194e18a53
Merge pull request #10876 from sfoslund/SdkManifestPackages
Adding SDK manifests VS package
2021-06-09 14:29:09 -07:00
Sarah Oslund
41ef6e2cac Adding SDK manifests vs package 2021-06-09 12:57:17 -07:00
dotnet-maestro[bot]
c3e0fa6d7b
Update dependencies from https://github.com/dotnet/arcade build 20210512.2 (#10872)
[release/5.0.3xx] Update dependencies from dotnet/arcade
2021-06-09 17:11:43 +00:00
dotnet-maestro[bot]
7f54d01025
Update dependencies from https://github.com/dotnet/arcade build 20210512.2 (#10871)
[release/5.0.2xx] Update dependencies from dotnet/arcade
2021-06-09 17:02:16 +00:00
dotnet-maestro[bot]
a2e7db07aa
Update dependencies from https://github.com/dotnet/arcade build 20210512.2 (#10870)
[release/5.0.4xx] Update dependencies from dotnet/arcade
2021-06-09 17:00:16 +00:00
Anirudh Agnihotry
c7a34b1f74
update versions (#10833) 2021-06-09 09:10:52 -07:00