Commit graph

2266 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
Daniel Plaisted
39d41c1eb2 Revert to Windows SDK package versions that are currently published 2021-06-11 12:32:36 -07:00
Roman Konecny
2dcd200fb5
Configure xunit to report long running tests for EndToEnd (#10847) 2021-06-08 20:11:19 +02:00
Marc Paine
789b3b05e8
Merge pull request #10770 from jsoref/spelling
Spelling
2021-05-26 14:22:34 -07:00
dotnet-maestro[bot]
f5e202178a
[main] Update dependencies from dotnet/sdk (#10763)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-preview.6.21274.7 to 6.0.0-preview.6.21276.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-preview.6.21274.7 to 6.0.0-preview.6.21276.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-preview.6.21274.1 to 6.0.0-preview.6.21275.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 6.0.0-preview.6.21274.1 to 6.0.0-preview.6.21275.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-preview.6.21274.1 to 6.0.0-preview.6.21275.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-preview.6.21274.1 to 6.0.0-preview.6.21275.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-preview.6.21274.1 to 6.0.0-preview.6.21275.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 6.0.0-preview.6.21274.1 to 6.0.0-preview.6.21275.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.6.21274.12 to 6.0.0-preview.6.21275.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.6.21274.12 to 6.0.0-preview.6.21275.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.6.21274.12 to 6.0.0-preview.6.21275.8 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.6.21274.12 to 6.0.0-preview.6.21275.8 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 6.0.0-preview.6.21274.12 to 6.0.0-preview.6.21275.8 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 6.0.0-preview.6.21274.12 to 6.0.0-preview.6.21275.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-preview.6.21275.1 to 6.0.100-preview.6.21276.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.6.21274.7 to 6.0.0-preview.6.21276.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-preview.6.21274.6 to 6.0.0-preview.6.21276.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.6.21274.7 to 6.0.0-preview.6.21276.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-preview.6.21274.6 to 6.0.0-preview.6.21276.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.Net.Compilers.Toolset: from 4.0.0-1.21274.8 to 4.0.0-1.21275.5 (parent: Microsoft.NET.Sdk)
  - NuGet.Build.Tasks: from 5.10.0-rc.7240 to 6.0.0-preview.1.66 (parent: Microsoft.NET.Sdk)

 - Remove test for reactredux template

See dotnet/aspnetcore#32598
2021-05-26 17:43:43 +00:00
Josh Soref
402c6e5ee9 spelling: framework
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
2021-05-26 05:16:13 -04:00
Josh Soref
049a0dcccf spelling: enabled
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
2021-05-26 05:16:13 -04:00
Sarah Oslund
ea01267f1b Revert test config changes 2021-05-24 15:31:58 -07:00
Jason Zhai
bb648ef774 Merge branch 'release/5.0.3xx' into main 2021-05-20 21:23:53 -07:00
William Li
56797e67ed Update implicit versions
Disable and fix tests do not work with non-existent
LastRuntimeFrameworkVersion
2021-05-20 09:22:45 -07:00
Marc Paine
8847ed9e06
Merge pull request #10294 from dotnet/marcpopMSFT-reenableinproc
Re-enable in-process msbuild for ES tests
2021-05-12 14:19:38 -07:00
Sarah Oslund
d74f5705b0
Merge pull request #10487 from sfoslund/SourceBuildPatches
Source build patches
2021-05-12 08:10:53 -07:00
Forgind
00a58f35a7
Merge branch 'main' into create-precomputed-rar-cache 2021-05-05 09:31:28 -07:00
dseefeld
de3ef19a40 Exclude test folder from source-build 2021-05-04 10:49:31 -07:00
Vlada Shubina
ac6ce6b6b5
added tests to check if the templates shipped with SDK have net6.0 set as default framework (#10238)
* fixes dotnet/templating#3054 dotnet/templating#2797 checks if the templates shipped with SDK have net6.0 set as default framework

adds new data sets for templating managed templates
adds basic tests on item templates as they were missing
console templates are targeting net6.0 already so fixes dotnet/installer#8974

* made a special case for 'grpc' not to run on linux-musl
2021-04-30 15:20:20 +03:00
Nathan Mytelka
93b2806b0a Merge branch 'main' of https://github.com/dotnet/installer into create-precomputed-rar-cache 2021-04-28 10:45:26 -07:00
Nathan Mytelka
9b276b33a7 Remove slash
This makes it a double slash, which escapes it, causing a FileNotFound exception on linux
2021-04-22 10:45:40 -07:00
Marc Paine
5c891416a3
Update SdkTests.csproj 2021-04-22 10:27:56 -07:00
dotnet-maestro[bot]
92ea20bfb8
[main] Update dependencies from dotnet/sdk (#10226)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-preview.4.21213.9 to 6.0.0-preview.4.21215.3 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-preview.4.21213.9 to 6.0.0-preview.4.21215.3 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-preview.4.21213.3 to 6.0.0-preview.4.21215.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 6.0.0-preview.4.21213.3 to 6.0.0-preview.4.21215.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-preview.4.21213.3 to 6.0.0-preview.4.21215.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-preview.4.21213.3 to 6.0.0-preview.4.21215.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-preview.4.21213.3 to 6.0.0-preview.4.21215.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 6.0.0-preview.4.21213.3 to 6.0.0-preview.4.21215.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.4.21213.1 to 6.0.0-preview.4.21215.16 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.4.21213.1 to 6.0.0-preview.4.21215.16 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.4.21213.1 to 6.0.0-preview.4.21215.16 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.4.21213.1 to 6.0.0-preview.4.21215.16 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 6.0.0-preview.4.21213.1 to 6.0.0-preview.4.21215.16 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 6.0.0-preview.4.21213.1 to 6.0.0-preview.4.21215.16 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-preview.4.21213.1 to 6.0.100-preview.4.21216.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.4.21213.9 to 6.0.0-preview.4.21215.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-preview.4.21213.10 to 6.0.0-preview.4.21215.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.4.21213.9 to 6.0.0-preview.4.21215.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-preview.4.21213.18 to 6.0.0-preview.4.21215.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.FSharp.Compiler: from 11.4.2-beta.21212.7 to 11.4.2-beta.21214.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.ILLink.Tasks: from 6.0.100-preview.2.21212.5 to 6.0.100-preview.2.21215.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 3.10.0-3.21213.18 to 3.10.0-3.21215.28 (parent: Microsoft.NET.Sdk)

 - validate inserted manifest

 - Merge branch 'darc-main-64df7133-1e9b-45ab-b603-1cefc648ba97' of https://github.com/dotnet/core-sdk into darc-main-64df7133-1e9b-45ab-b603-1cefc648ba97
2021-04-16 16:17:09 +00:00
dotnet-maestro[bot]
73f0a697e4
[main] Update dependencies from dotnet/sdk (#10185)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-preview.4.21206.2 to 6.0.0-preview.4.21212.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-preview.4.21206.2 to 6.0.0-preview.4.21212.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-preview.4.21205.3 to 6.0.0-preview.4.21213.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 6.0.0-preview.4.21205.3 to 6.0.0-preview.4.21213.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-preview.4.21205.3 to 6.0.0-preview.4.21213.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-preview.4.21205.3 to 6.0.0-preview.4.21213.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-preview.4.21205.3 to 6.0.0-preview.4.21213.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 6.0.0-preview.4.21205.3 to 6.0.0-preview.4.21213.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.4.21207.16 to 6.0.0-preview.4.21213.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.4.21207.16 to 6.0.0-preview.4.21213.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.4.21207.16 to 6.0.0-preview.4.21213.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.4.21207.16 to 6.0.0-preview.4.21213.1 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 6.0.0-preview.4.21207.16 to 6.0.0-preview.4.21213.1 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 6.0.0-preview.4.21207.16 to 6.0.0-preview.4.21213.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-preview.4.21206.2 to 6.0.100-preview.4.21213.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.4.21206.2 to 6.0.0-preview.4.21212.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-preview.4.21205.2 to 6.0.0-preview.4.21212.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.4.21206.2 to 6.0.0-preview.4.21212.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-preview.4.21206.1 to 6.0.0-preview.4.21212.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.FSharp.Compiler: from 11.4.2-beta.21204.5 to 11.4.2-beta.21212.7 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.ILLink.Tasks: from 6.0.100-preview.2.21207.1 to 6.0.100-preview.2.21212.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 3.10.0-3.21208.2 to 3.10.0-3.21213.18 (parent: Microsoft.NET.Sdk)
  - NuGet.Build.Tasks: from 5.10.0-preview.2.7190 to 5.10.0-preview.2.7203 (parent: Microsoft.NET.Sdk)

 - Merge branch 'main' into darc-main-4ed89ff0-d420-4cac-9486-36d8a69c8e12

 - Set DOTNET_CLI_RUN_MSBUILD_OUTOFPROC=true for SdkTests.csproj

Forces the started dotnet CLI to not load MSBuild.dll in-proc, see https://github.com/dotnet/installer/pull/10185#issuecomment-819463807.
2021-04-14 12:49:16 +00:00
William Li
beafdfb942 Update implicit versions
Disable and fix tests do not work with non-existent
LastRuntimeFrameworkVersion
2021-03-05 14:40:11 -08:00
Juan Sebastian Hoyos Ayala
7fbfea47cc Mark ARM64 as a valid platform for WPF and WinForms and fix support bug
Co-authored-by: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Co-authored-by: Marcpems <marcpe@microsoft.com>
Co-authored-by: Ryland <41491307+ryalanms@users.noreply.github.com>
2021-01-22 16:03:50 -08:00
William Li
2a19fdee15 Revert "disable test as tool build for now"
This reverts commit bc5222343943818cba91aacd97b63fec2f516707.
2020-11-17 09:36:12 -08:00
dotnet-maestro[bot]
bb1e128c34
[master] Update dependencies from dotnet/sdk (#9064)
[master] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.AspNetCore.App.Ref: from 6.0.0-alpha.1.20526.6 to 6.0.0-alpha.1.20561.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-alpha.1.20526.6 to 6.0.0-alpha.1.20561.2 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-alpha.1.20526.6 to 6.0.0-alpha.1.20561.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.EntityFrameworkCore: from 6.0.0-alpha.1.20509.5 to 6.0.0-alpha.1.20560.6 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-alpha.1.20526.6 to 6.0.0-alpha.1.20561.2 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 6.0.0-alpha.1.20526.6 to 6.0.0-alpha.1.20561.2 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 6.0.0-alpha.1.20526.6 to 6.0.0-alpha.1.20561.2 (parent: Microsoft.NET.Sdk)
  - dotnet-watch: from 6.0.0-alpha.1.20526.6 to 6.0.0-alpha.1.20561.2 (parent: Microsoft.NET.Sdk)

 - Update installer target framework to 6.0

 - Install 5.0.0 and 3.1.0 runtime

 - Merge remote-tracking branch 'upstream/master' into darc-master-4cce5096-36fd-4b94-ba12-5d198a821a27

 - Update SDK to one that targets 6.0

 - disable test as tool build for now

 - Fix aspnet runtime RID
2020-11-17 06:56:05 +00:00
Matt Mitchell
32d179d680
Update the installer target framework net6.0 (#9069)
- Remove unneeded package for tool install
- Install 5.0.0 and 3.1.0 runtime (rather than a preview 3.1.0 runtime)
2020-11-13 10:56:11 -08:00
dotnet-maestro[bot]
f17cf3399b
[master] Update dependencies from dotnet/sdk (#8966)
[master] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20417.4 to 6.0.0-alpha.1.20531.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20417.4 to 6.0.0-alpha.1.20531.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 6.0.0-alpha.1.20513.9 to 6.0.0-alpha.1.20551.7 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Internal: from 6.0.0-alpha.1.20513.9 to 6.0.0-alpha.1.20551.7 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-alpha.1.20513.9 to 6.0.0-alpha.1.20551.7 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-alpha.1.20513.9 to 6.0.0-alpha.1.20551.7 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-alpha.1.20513.9 to 6.0.0-alpha.1.20551.7 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 6.0.0-alpha.1.20513.9 to 6.0.0-alpha.1.20551.7 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 6.0.0-alpha.1.20513.8 to 6.0.0-alpha.1.20526.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-alpha.1.20513.8 to 6.0.0-alpha.1.20526.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-alpha.1.20513.8 to 6.0.0-alpha.1.20526.6 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 6.0.0-alpha.1.20513.8 to 6.0.0-alpha.1.20526.6 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 6.0.0-alpha.1.20513.8 to 6.0.0-alpha.1.20526.6 (parent: Microsoft.NET.Sdk)
  - dotnet-watch: from 6.0.0-alpha.1.20513.8 to 6.0.0-alpha.1.20526.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Common.ItemTemplates: from 6.0.0-alpha.1.20514.1 to 6.0.0-alpha.1.20552.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20417.1 to 6.0.0-alpha.1.20528.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20417.4 to 6.0.0-alpha.1.20531.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20417.3 to 6.0.0-alpha.1.20529.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.NET.Test.Sdk: from 16.9.0-preview-20201013-01 to 16.8.0-release-20201022-02 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.ILLink.Tasks: from 6.0.0-alpha.1.20514.1 to 6.0.0-alpha.1.20527.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 3.9.0-1.20513.7 to 3.9.0-2.20552.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.Build: from 16.9.0-preview-20513-07 to 16.9.0-preview-20530-04 (parent: Microsoft.NET.Sdk)
  - NuGet.Build.Tasks: from 5.8.0-rc.6860 to 5.8.0-rc.6930 (parent: Microsoft.NET.Sdk)

 - Update name of VS.Redist package

 - Update VS.Redist

 - Update Version.Details.xml

 - Update Versions.props

 - Merge branch 'master' into darc-master-e43dc338-58af-4dcb-8f48-e598405b6d80

 - Disable test
2020-11-03 21:06:10 +00:00
Daniel Plaisted
c5bc07d915 Apply code review feedback 2020-10-26 20:18:09 -07:00
Daniel Plaisted
9ec9fce35e Update tests for .NET 6 2020-10-25 19:19:57 -07:00
Daniel Plaisted
2c7d23afe9 Add KnownFrameworkReference items for .NET 6
Fixes https://github.com/dotnet/sdk/issues/13950
2020-10-23 13:19:43 -07:00
Juan Hoyos
53d412f76f
Add "Add arm64 as a possible WinForms arch (#7457)" back (#8906)
This reverts commit a3fc14fd2e.
2020-10-16 09:39:31 -07:00
dotnet-maestro[bot]
78009f66a1
[release/5.0.1xx] Update dependencies from dotnet/arcade (#8842)
[release/5.0.1xx] Update dependencies from dotnet/arcade


 - Fix compile error in test
2020-10-13 16:22:59 +00:00
William Li
37ed338303 Merge branch 'release/5.0.1xx-rc2' into master-merge-rc2-2 2020-09-24 22:23:16 -07:00
Matt Mitchell
f56648180f
Use aspnetcore version suffix for template install directory (#8625)
This change is required for RTM stable builds. When stable versions are generated the CalculateTemplateVersions task will fail.

For .NET 3.x, installer is partially on arcade. It uses its own versioning model, but the arcade generated versions are actually set (specifically VersionSuffix). So even when stable builds are generated, VersionSuffix is available. It is unused when the aspnetcore template versions are stable.

For .NET 5, installer is now fully on arcade versioning, which means VersionSuffix is not set when stable versions are generated.

Instead of using installer's version suffix if aspnetcore's template versions are unstable, use the version suffix of the aspnetcore template versions. This subtley affects the installer directory of the templates:

If the aspnetcore version is: 5.0.0-rc.1.1234.5
And the installer version is: 5.0.100-rc.1.9999.9
Then:

Template install dir before this change: .dotnet\templates\5.0.0-rc.1.9999.9
Template install dir after this change: .dotnet\templates\5.0.0-rc.1.1234.5
Of note: The overall template layout doesn't make a ton of sense. The aspnetcore template version is used for the install directory, but many different templates are put in this directory, including some that have completely different versions.
2020-09-22 14:32:10 -07:00
Juan Sebastian Hoyos Ayala
a3fc14fd2e Revert "Add arm64 as a possible WinForms arch (#7457)"
This reverts commit f1564ea07f, reversing
changes made to 0adcdc972a.
2020-09-11 13:10:57 -07:00
Matt Mitchell
97f447f228
Merge pull request #8388 from sfoslund/MergeRC1ToMaster
Merge RC1 to master
2020-09-08 07:39:48 -07:00
dotnet-maestro[bot]
1a86c899e3
[master] Update dependencies from dotnet/sdk (#8235)
[master] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20453.28 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20453.28 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20453.28 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20453.28 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20453.28 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20453.28 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20419.22 to 5.0.0-rc.2.20454.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20419.22 to 5.0.0-rc.2.20454.3 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20419.22 to 5.0.0-rc.2.20454.3 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 5.0.0-rc.1.20419.22 to 5.0.0-rc.2.20454.3 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 5.0.0-rc.1.20419.22 to 5.0.0-rc.2.20454.3 (parent: Microsoft.NET.Sdk)
  - dotnet-watch: from 5.0.0-rc.1.20419.22 to 5.0.0-rc.2.20454.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Common.ItemTemplates: from 5.0.0-rc.1.20419.1 to 6.0.0-alpha.1.20454.5 (parent: Microsoft.NET.Sdk)

- Updates:
  - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20420.8 to 6.0.100-alpha.1.20454.15
  - Microsoft.NET.Sdk: from 5.0.100-rc.1.20420.8 to 6.0.100-alpha.1.20454.15
  - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20453.28
  - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20453.28
  - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20453.28
  - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20453.28
  - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20453.28
  - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20453.28
  - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20419.22 to 5.0.0-rc.2.20454.3
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20419.22 to 5.0.0-rc.2.20454.3
  - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20419.22 to 5.0.0-rc.2.20454.3
  - dotnet-dev-certs: from 5.0.0-rc.1.20419.22 to 5.0.0-rc.2.20454.3
  - dotnet-user-secrets: from 5.0.0-rc.1.20419.22 to 5.0.0-rc.2.20454.3
  - dotnet-watch: from 5.0.0-rc.1.20419.22 to 5.0.0-rc.2.20454.3
  - Microsoft.DotNet.Common.ItemTemplates: from 5.0.0-rc.1.20419.1 to 6.0.0-alpha.1.20454.5

 - Update NuGet.config

 - Updates for 6.0 runtime

 - Reenabling test

 - Fixup toolset base url
2020-09-04 22:28:24 +00:00
Sarah Oslund
1455151d84 Update cswinrt tests for 4 part version numbers 2020-08-31 15:41:21 -07:00
William Li
3232fe7ac1
Move few GivenWeWantToRequireWindowsForDesktopApps tests (#8205)
Fix https://github.com/dotnet/installer/issues/8203
2020-08-20 06:32:19 -07:00
William Li
935b166ebd
Revert "disable test It_generates_a_single_file_for_self_contained_apps" 2020-07-21 16:12:39 -07:00
vsadov
a1e42b52a2 disable test It_generates_a_single_file_for_self_contained_apps 2020-07-08 18:02:14 -07:00
William Li
7aaf0d85d0 Add in cswinrt KnownFrameworkReference 2020-07-07 15:06:06 -07:00
dotnet-maestro[bot]
6e0b23afa7
[master] Update dependencies from dotnet/sdk (#7497)
* Update dependencies from https://github.com/dotnet/sdk build 20200515.4

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 5.0.100-preview.5.20264.7 -> To Version 5.0.100-preview.5.20265.4

* Update dependencies from https://github.com/dotnet/sdk build 20200515.5

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 5.0.100-preview.5.20264.7 -> To Version 5.0.100-preview.5.20265.5

* Update dependencies from https://github.com/dotnet/sdk build 20200518.6

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 5.0.100-preview.5.20264.7 -> To Version 5.0.100-preview.5.20268.6

* Update dependencies from https://github.com/dotnet/sdk build 20200518.7

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 5.0.100-preview.5.20264.7 -> To Version 5.0.100-preview.5.20268.7

* Update dependencies from https://github.com/dotnet/sdk build 20200518.8

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 5.0.100-preview.5.20264.7 -> To Version 5.0.100-preview.5.20268.8

* Update dependencies from https://github.com/dotnet/sdk build 20200518.9

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 5.0.100-preview.5.20264.7 -> To Version 5.0.100-preview.5.20268.9

* Update dependencies from https://github.com/dotnet/sdk build 20200518.10

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 5.0.100-preview.5.20264.7 -> To Version 5.0.100-preview.5.20268.10

* Update dependencies from https://github.com/dotnet/sdk build 20200519.2

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 5.0.100-preview.5.20264.7 -> To Version 5.0.100-preview.5.20269.2

* Update dependencies from https://github.com/dotnet/sdk build 20200519.3

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 5.0.100-preview.5.20264.7 -> To Version 5.0.100-preview.5.20269.3

* Update dependencies from https://github.com/dotnet/sdk build 20200519.4

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 5.0.100-preview.5.20264.7 -> To Version 5.0.100-preview.5.20269.4

* Update dependencies from https://github.com/dotnet/sdk build 20200519.5

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 5.0.100-preview.5.20264.7 -> To Version 5.0.100-preview.5.20269.5

* Update dependencies from https://github.com/dotnet/sdk build 20200519.6

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 5.0.100-preview.5.20264.7 -> To Version 5.0.100-preview.5.20269.6

* Skip new added publish tests

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: William Li <wul@microsoft.com>
2020-05-19 17:36:39 +00:00
Juan Sebastian Hoyos Ayala
63ca19534d Mark ARM64 WindowsDesktop tests as Windows only 2020-05-15 11:48:31 -07:00
Juan Sebastian Hoyos Ayala
498874b860 Add ARM WindowsDesktop tests 2020-05-14 17:46:19 -07:00
Eric Erhardt
efe7c8e566
Remove references to PlatformAbstractions. (#7408)
* Remove references to PlatformAbstractions.

This will allow us to remove the PlatformAbstractions library from dotnet/runtime.

Contributes to https://github.com/dotnet/runtime/issues/3470
2020-05-06 09:59:23 -05:00
dotnet-maestro[bot]
2db1aa8754
[master] Update dependencies from dotnet/sdk (#7208)
* Update dependencies from https://github.com/dotnet/sdk build 20200417.2

- Microsoft.DotNet.MSBuildSdkResolver: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20217.2
- Microsoft.NET.Sdk: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20217.2

* Update dependencies from https://github.com/dotnet/sdk build 20200417.3

- Microsoft.DotNet.MSBuildSdkResolver: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20217.3
- Microsoft.NET.Sdk: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20217.3

* Update dependencies from https://github.com/dotnet/sdk build 20200417.4

- Microsoft.DotNet.MSBuildSdkResolver: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20217.4
- Microsoft.NET.Sdk: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20217.4

* Update dependencies from https://github.com/dotnet/sdk build 20200417.5

- Microsoft.DotNet.MSBuildSdkResolver: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20217.5
- Microsoft.NET.Sdk: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20217.5

* Update dependencies from https://github.com/dotnet/sdk build 20200417.6

- Microsoft.DotNet.MSBuildSdkResolver: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20217.6
- Microsoft.NET.Sdk: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20217.6

* Update dependencies from https://github.com/dotnet/sdk build 20200417.7

- Microsoft.DotNet.MSBuildSdkResolver: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20217.7
- Microsoft.NET.Sdk: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20217.7

* Update dependencies from https://github.com/dotnet/sdk build 20200417.8

- Microsoft.DotNet.MSBuildSdkResolver: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20217.8
- Microsoft.NET.Sdk: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20217.8

* Update dependencies from https://github.com/dotnet/sdk build 20200418.1

- Microsoft.DotNet.MSBuildSdkResolver: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20218.1
- Microsoft.NET.Sdk: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20218.1

* Update dependencies from https://github.com/dotnet/sdk build 20200418.2

- Microsoft.DotNet.MSBuildSdkResolver: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20218.2
- Microsoft.NET.Sdk: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20218.2

* Update dependencies from https://github.com/dotnet/sdk build 20200418.3

- Microsoft.DotNet.MSBuildSdkResolver: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20218.3
- Microsoft.NET.Sdk: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20218.3

* Update dependencies from https://github.com/dotnet/sdk build 20200418.4

- Microsoft.DotNet.MSBuildSdkResolver: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20218.4
- Microsoft.NET.Sdk: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20218.4

* Update dependencies from https://github.com/dotnet/sdk build 20200419.1

- Microsoft.DotNet.MSBuildSdkResolver: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20219.1
- Microsoft.NET.Sdk: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20219.1

* Update dependencies from https://github.com/dotnet/sdk build 20200419.2

- Microsoft.DotNet.MSBuildSdkResolver: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20219.2
- Microsoft.NET.Sdk: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20219.2

* Update dependencies from https://github.com/dotnet/sdk build 20200419.3

- Microsoft.DotNet.MSBuildSdkResolver: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20219.3
- Microsoft.NET.Sdk: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20219.3

* Update dependencies from https://github.com/dotnet/sdk build 20200420.1

- Microsoft.DotNet.MSBuildSdkResolver: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20220.1
- Microsoft.NET.Sdk: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20220.1

* Update dependencies from https://github.com/dotnet/sdk build 20200420.2

- Microsoft.DotNet.MSBuildSdkResolver: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20220.2
- Microsoft.NET.Sdk: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20220.2

* Update dependencies from https://github.com/dotnet/sdk build 20200420.3

- Microsoft.DotNet.MSBuildSdkResolver: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20220.3
- Microsoft.NET.Sdk: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20220.3

* Switch to using RuntimeInformation APIs instead of deprecated PlatformAbstractions

See https://github.com/dotnet/sdk/pull/11076

* Update dependencies from https://github.com/dotnet/sdk build 20200420.4

- Microsoft.DotNet.MSBuildSdkResolver: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20220.4
- Microsoft.NET.Sdk: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20220.4

* Update dependencies from https://github.com/dotnet/sdk build 20200420.5

- Microsoft.DotNet.MSBuildSdkResolver: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20220.5
- Microsoft.NET.Sdk: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20220.5

* Update dependencies from https://github.com/dotnet/sdk build 20200420.7

- Microsoft.DotNet.MSBuildSdkResolver: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20220.7
- Microsoft.NET.Sdk: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20220.7

* Update dependencies from https://github.com/dotnet/sdk build 20200420.8

- Microsoft.DotNet.MSBuildSdkResolver: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20220.8
- Microsoft.NET.Sdk: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20220.8

* Update dependencies from https://github.com/dotnet/sdk build 20200420.10

- Microsoft.DotNet.MSBuildSdkResolver: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20220.10
- Microsoft.NET.Sdk: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20220.10

* Update dependencies from https://github.com/dotnet/sdk build 20200420.12

- Microsoft.DotNet.MSBuildSdkResolver: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20220.12
- Microsoft.NET.Sdk: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20220.12

* Update dependencies from https://github.com/dotnet/sdk build 20200420.13

- Microsoft.DotNet.MSBuildSdkResolver: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20220.13
- Microsoft.NET.Sdk: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20220.13

* Update dependencies from https://github.com/dotnet/sdk build 20200421.1

- Microsoft.DotNet.MSBuildSdkResolver: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20221.1
- Microsoft.NET.Sdk: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20221.1

* Update dependencies from https://github.com/dotnet/sdk build 20200421.2

- Microsoft.DotNet.MSBuildSdkResolver: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20221.2
- Microsoft.NET.Sdk: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20221.2

* Update dependencies from https://github.com/dotnet/sdk build 20200421.3

- Microsoft.DotNet.MSBuildSdkResolver: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20221.3
- Microsoft.NET.Sdk: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20221.3

* Update dependencies from https://github.com/dotnet/sdk build 20200421.4

- Microsoft.DotNet.MSBuildSdkResolver: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20221.4
- Microsoft.NET.Sdk: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20221.4

* Update dependencies from https://github.com/dotnet/sdk build 20200421.5

- Microsoft.DotNet.MSBuildSdkResolver: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.5.20221.5
- Microsoft.NET.Sdk: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.5.20221.5

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Daniel Plaisted <daplaist@microsoft.com>
2020-04-21 20:54:31 +00:00
Matt Mitchell
f5e7d53b35
[release/5.0.1xx-preview3] Set up TLS 1.2 before calling dotnet-install for tests (#7068)
* Set TLS1.2 before running dotnet-install in tests
The new powershell process overrides the setting that build.ps1 sets up.

* Reduce logging verbosity
2020-04-08 13:07:50 -07:00
Sarah Oslund
9722ea1895
Merge pull request #6938 from sfoslund/DefaultVersionTests
Adding test coverage for DefaultRuntimeFrameworkVersions
2020-03-30 11:26:19 -07:00
Sarah Oslund
981e4c6c26 Changing test project creation to using test asset instead of new command 2020-03-27 11:11:05 -07:00
Sarah Oslund
c18ce0d6af Adding test coverage for DefaultRuntimeFrameworkVersions 2020-03-26 15:18:41 -07:00