Commit graph

2407 commits

Author SHA1 Message Date
Marc Paine
eb4f50fabf
Update the stage 0 version and unwind a few of the upgrade changes (#17617) 2023-10-27 15:06:01 +00:00
Jason Zhai
2084a36452 Merge branch 'release/8.0.2xx' 2023-10-26 02:24:07 -07:00
Marc Paine
6c99222395
fix copy/paste error 2023-10-24 14:59:45 -07:00
Marc Paine
94d5c8a26a
Disable some tests that require the runtimepacks and targeting packs 2023-10-24 13:04:40 -07:00
Michael Yanni
be3df24252 Merge branch 'main' into merge/release/8.0.2xx-to-main
# Conflicts:
#	src/SourceBuild/content/eng/Versions.props
#	src/SourceBuild/content/global.json
2023-10-19 13:40:15 -07:00
Marc Paine
a0e2c17f4a Merge remote-tracking branch 'origin/darc-main-70fa24e6-a7d1-4df7-afe8-e790ad5c0989' into marcpopMSFT-flow9sdk 2023-10-12 14:57:55 -07:00
dotnet-maestro[bot]
b76fe590ac
[release/8.0.1xx] Update dependencies from dotnet/sdk (#17479)
[release/8.0.1xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 8.0.0-rtm.23504.7 to 8.0.0-rtm.23509.3 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0: from 8.0.0-rtm.23504.7 to 8.0.0-rtm.23509.3 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0: from 8.0.0-rtm.23504.7 to 8.0.0-rtm.23509.3 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.8.0: from 8.0.0-rtm.23504.8 to 8.0.0-rtm.23509.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 8.0.0-rtm.23504.8 to 8.0.0-rtm.23509.5 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.TargetingPack.x64.8.0: from 8.0.0-rtm.23504.8 to 8.0.0-rtm.23509.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 8.0.0-rtm.23504.8 to 8.0.0-rtm.23509.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 8.0.0-rtm.23504.8 to 8.0.0-rtm.23509.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 8.0.0-rtm.23504.8 to 8.0.0-rtm.23509.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 8.0.0-rtm.23502.22 to 8.0.0-rtm.23510.7 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 8.0.0-rtm.23502.22 to 8.0.0-rtm.23510.7 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 8.0.0-rtm.23502.22 to 8.0.0-rtm.23510.7 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0: from 8.0.0-rtm.23502.22 to 8.0.0-rtm.23510.7 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 8.0.0-rtm.23502.22 to 8.0.0-rtm.23510.7 (parent: Microsoft.NET.Sdk)
  - dotnet-user-jwts: from 8.0.0-rtm.23502.22 to 8.0.0-rtm.23510.7 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 8.0.0-rtm.23502.22 to 8.0.0-rtm.23510.7 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-rtm.23504.7 to 8.0.0-rtm.23509.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 8.0.0-rtm.23504.13 to 8.0.0-rtm.23509.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-rtm.23504.7 to 8.0.0-rtm.23509.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 8.0.0-rtm.23504.3 to 8.0.0-rtm.23509.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.NET.ILLink.Tasks: from 8.0.0-rtm.23504.8 to 8.0.0-rtm.23509.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 4.8.0-3.23504.4 to 4.8.0-3.23510.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.0-rtm.23504.8 to 8.0.0-rtm.23509.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport: from 8.0.0-rtm.23477.1 to 8.0.0-rtm.23504.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)

 - Add parens to the pattern to see if it fixes things
2023-10-11 20:18:04 +00:00
Larry Ewing
15b21b3e2d Add parens to the pattern to see if it fixes things 2023-10-11 12:03:44 -05:00
Jason Zhai
f7cadeb3e0 Merge branch 'release/8.0.2xx' 2023-10-09 20:54:34 -07:00
Viktor Hofer
7257cc38da Update xunit version 2023-10-08 15:18:11 +00:00
Marc Paine
c542cfcebe Respond to PR feedback:
-- remove extra spaces
-- add the 8.0 common templates into the 9 bundle
-- remove some duplicate msbuild targets
-- remove the windows known framework references
2023-10-04 11:02:10 -07:00
Marc Paine
091776ce37 Enable rollforward for the sdk tests 2023-10-02 14:53:52 -07:00
Marc Paine
929e9be7a2 Add the rc1 runtime so we can run the tools tests 2023-09-29 14:49:22 -07:00
Marc Paine
2b46b27808 Remove the extra runtime installed that isn't needed anymore. 2023-09-29 12:54:06 -07:00
Marc Paine
c1b4bc93c3 Fix additional tests that need to be manually retargeted at 9 and centralize the current tfm 2023-09-29 12:53:43 -07:00
Marc Paine
a95d4544b8 Fix tests for 9.0 runtime targeting 2023-09-29 11:42:14 -07:00
Marc Paine
a9c90a59a1 Install an 8.0 runtime
Enable the 8.0 default templates
2023-09-22 16:15:18 -07:00
Forgind
813105f23d
Create BaselineManifest.json (#17075) 2023-09-12 14:56:35 -07:00
Forgind
1b03f4b2b4 Fix test? 2023-09-08 12:15:03 -07:00
Forgind
6d6e5309a9 First --> Last 2023-09-08 11:54:56 -07:00
Forgind
f360881561 PR comments 2023-09-07 10:52:14 -07:00
Marc Paine
d5a2b52780 Add additional new tests to the exclusion list 2023-08-17 10:50:31 -07:00
Marc Paine
65507af7d9
disable the non-self-contained ones as well 2023-08-16 15:17:12 -07:00
Marc Paine
aa340cf3db disable the net6.0 self-contained tests as we can't target the unreleased implicit version 2023-08-16 13:46:18 -07:00
Marc Paine
45cda7ffaa Update tests to skip list for unreleased runtimes 2023-08-16 09:23:20 -07:00
dotnet-maestro[bot]
1c0b692a4e
[main] Update dependencies from dotnet/sdk (#17118)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
Co-authored-by: Eric Erhardt <eric.erhardt@microsoft.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
Co-authored-by: Steve Pfister <steveisok@users.noreply.github.com>
Co-authored-by: Matt Thalman <mthalman@microsoft.com>
Co-authored-by: Larry Ewing <lewing@microsoft.com>
2023-08-15 02:20:42 +00:00
Forgind
0220e2614c Fix the fix 😒 2023-08-10 09:35:04 -07:00
Forgind
d78a0b7912 Check for baseline manifest as well 2023-08-10 09:19:55 -07:00
Forgind
f947a6cc4c Look inside one extra folder 2023-07-31 09:35:27 -07:00
dotnet-maestro[bot]
491c0f241b
[main] Update dependencies from dotnet/sdk (#17013)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Larry Ewing <lewing@microsoft.com>
Co-authored-by: wtgodbe <wigodbe@microsoft.com>
Co-authored-by: Matt Thalman <mthalman@microsoft.com>
2023-07-20 10:38:19 +10:00
Marc Paine
6eaaf3e962 Remove blazor server from the installer tests as it was removed from the templates in https://github.com/dotnet/aspnetcore/pull/48615 2023-06-22 11:22:41 -07:00
Marc Paine
b967d7961f
Disable a new sdk test that requires testassets.props to exist 2023-06-13 10:22:23 -07:00
dotnet-maestro[bot]
b58fa60f84
[main] Update dependencies from dotnet/arcade (#16444)
[main] Update dependencies from dotnet/arcade


 - Upgrade the xunit version

 - Merge branch 'main' into darc-main-1fe39f5b-5397-4607-9a61-7f9bae3a3928
2023-05-22 15:21:00 +00:00
Marc Paine
1d3413654c Update the publish tests to handle both self contained and not
Update the publish tests to target current and net6
Fix the selfcontained logic in the common test method
2023-05-10 14:55:29 -07:00
Sven Boemer
c9aba005be Fix linux platform detection 2023-04-15 01:01:43 +00:00
Jeremy Koritzinsky
70ab30487b
Merge branch 'darc-main-d1692cc6-e594-4aaf-9242-8c8113d82c8d' of github.com:dotnet/installer into darc-main-d1692cc6-e594-4aaf-9242-8c8113d82c8d 2023-04-14 15:33:06 -07:00
Jeremy Koritzinsky
8810add5ec
Skip failing SDK tests on Linux 2023-04-14 15:32:34 -07:00
Marc Paine
f9759ff4e6 I believe multiple config files can be used at the same time. Updating to add a linux exclusion file for a test not supported on centos8 2023-04-14 15:31:01 -07:00
Jason Zhai
c08416f7c7 Merge branch 'release/7.0.3xx' 2023-03-09 01:32:15 -08:00
Jason Zhai
5a8e9580e9 Merge branch 'release/7.0.2xx' into release/7.0.3xx 2023-03-07 22:00:28 -08:00
Jason Zhai
a405240f2b Merge branch 'release/6.0.4xx' into release/7.0.1xx 2023-02-16 18:38:41 -08:00
Jason Zhai
90e19b754c Merge branch 'release/7.0.3xx' 2023-02-14 23:31:38 -08:00
Jason Zhai
f678538cf6 Merge branch 'release/6.0.1xx' into release/6.0.3xx 2023-02-14 22:47:37 -08:00
vseanreesermsft
f66604ee7a
Merging internal commits for release/6.0.1xx (#15533)
Co-authored-by: dotnet-bot <dotnet-bot@microsoft.com>
Co-authored-by: DotNet-Bot <dn-bot@microsoft.com>
Co-authored-by: Matt Mitchell <mmitche@microsoft.com>
Co-authored-by: Marc Paine <marcpop@microsoft.com>
2023-02-14 13:51:20 -08:00
YuliiaKovalova
7da88e07cc
add tests for covering adding item templates (C# and VB) (#15343) 2023-02-14 14:06:02 +01:00
dotnet-maestro-bot
91caa7d21c
[automated] Merge branch 'release/7.0.2xx' => 'release/7.0.3xx' (#15514)
Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
Co-authored-by: Matt Mitchell <mmitche@microsoft.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
Co-authored-by: Logan Bussell <loganbussell@microsoft.com>
Co-authored-by: Chris Rummel <crummel@microsoft.com>
Co-authored-by: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com>
Co-authored-by: dotnet-bot <dotnet-bot@microsoft.com>
Co-authored-by: DotNet-Bot <dn-bot@microsoft.com>
Co-authored-by: Sean Reeser <v-seanreeser@microsoft.com>
Co-authored-by: Marc Paine <marcpop@microsoft.com>
Co-authored-by: William Godbe <wigodbe@microsoft.com>
Co-authored-by: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com>
Co-authored-by: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com>
Co-authored-by: Matt Thalman <mthalman@microsoft.com>
Co-authored-by: Daniel Plaisted <dsplaisted@gmail.com>
2023-02-13 13:50:32 -08:00
dotnet-maestro-bot
535d6f657c
[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' (#15279)
Co-authored-by: dotnet-bot <dotnet-bot@microsoft.com>
Co-authored-by: Matt Mitchell <mmitche@microsoft.com>
Co-authored-by: DotNet-Bot <dn-bot@microsoft.com>
Co-authored-by: MichaelSimons <msimons@microsoft.com>
Co-authored-by: Chris Rummel <crummel@microsoft.com>
Co-authored-by: Sean Reeser <v-seanreeser@microsoft.com>
Co-authored-by: Marc Paine <marcpop@microsoft.com>
Co-authored-by: William Godbe <wigodbe@microsoft.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
Co-authored-by: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com>
Co-authored-by: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com>
Co-authored-by: Matt Thalman <mthalman@microsoft.com>
Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Daniel Plaisted <dsplaisted@gmail.com>
2023-02-07 15:15:41 -08:00
Larry Ewing
6caeedd097
[main] Fix MonoToolchain.Current naming and Update dependencies from dotnet/emsdk and dotnet/sdk (#15366)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Marc Paine <marcpop@microsoft.com>
Co-authored-by: Noah Gilson <noahgilson@microsoft.com>
2023-01-31 02:53:16 +00:00
dotnet-maestro[bot]
c125386cae
[main] Update dependencies from dotnet/sdk (#15151)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 8.0.0-alpha.1.22614.1 to 8.0.0-alpha.1.23053.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0: from 8.0.0-alpha.1.22614.1 to 8.0.0-alpha.1.23053.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0: from 8.0.0-alpha.1.22614.1 to 8.0.0-alpha.1.23053.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.8.0: from 8.0.0-alpha.1.22605.1 to 8.0.0-alpha.1.23053.7 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 8.0.0-alpha.1.22605.1 to 8.0.0-alpha.1.23053.7 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.TargetingPack.x64.8.0: from 8.0.0-alpha.1.22605.1 to 8.0.0-alpha.1.23053.7 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.0-alpha.1.22605.1 to 8.0.0-alpha.1.23053.7 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 8.0.0-alpha.1.22605.1 to 8.0.0-alpha.1.23053.7 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 8.0.0-alpha.1.22605.1 to 8.0.0-alpha.1.23053.7 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 8.0.0-alpha.1.22605.1 to 8.0.0-alpha.1.23053.7 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 8.0.0-alpha.1.22615.1 to 8.0.0-alpha.1.23053.19 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 8.0.0-alpha.1.22615.1 to 8.0.0-alpha.1.23053.19 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 8.0.0-alpha.1.22615.1 to 8.0.0-alpha.1.23053.19 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0: from 8.0.0-alpha.1.22615.1 to 8.0.0-alpha.1.23053.19 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 8.0.0-alpha.1.22615.1 to 8.0.0-alpha.1.23053.19 (parent: Microsoft.NET.Sdk)
  - dotnet-user-jwts: from 8.0.0-alpha.1.22615.1 to 8.0.0-alpha.1.23053.19 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 8.0.0-alpha.1.22615.1 to 8.0.0-alpha.1.23053.19 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-alpha.1.22614.1 to 8.0.0-alpha.1.23053.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 8.0.0-alpha.1.22602.3 to 8.0.0-alpha.1.22628.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-alpha.1.22614.1 to 8.0.0-alpha.1.23053.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 8.0.0-alpha.1.22603.1 to 8.0.0-alpha.1.22631.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.FSharp.Compiler: from 12.5.0-beta.22612.4 to 12.5.0-beta.23053.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.SourceBuild.Intermediate.fsharp: from 7.0.1-beta.22612.4 to 7.0.1-beta.23053.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.Test.Sdk: from 17.5.0-preview-20221214-01 to 17.6.0-preview-20230103-01 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.ILLink.Tasks: from 8.0.100-1.22612.2 to 8.0.100-1.23053.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 4.5.0-2.22613.14 to 4.5.0-3.23053.22 (parent: Microsoft.NET.Sdk)
  - Microsoft.Build: from 17.5.0-preview-22615-01 to 17.5.0-preview-23054-02 (parent: Microsoft.NET.Sdk)
  - NuGet.Build.Tasks: from 6.5.0-preview.3.130 to 6.5.0-preview.3.136 (parent: Microsoft.NET.Sdk)

 - Update ProjectBuildTests.cs

 - Don't crossgen ILLink which is no longer bundled

 - Merge branch 'main' of https://github.com/dotnet/installer into darc-main-66d586e3-f52b-4957-867f-75cf448ba8b8

 - Merge remote-tracking branch 'upstream/darc-main-e0248016-a57a-4ad2-aa0c-03ad8d093d6b' into darc-main-66d586e3-f52b-4957-867f-75cf448ba8b8

 - Add SuppressTfmSupportBuildWarnings=true in source-build

 - Merge branch 'darc-main-66d586e3-f52b-4957-867f-75cf448ba8b8' of https://github.com/dotnet/installer into darc-main-66d586e3-f52b-4957-867f-75cf448ba8b8

 - Update GenerateLayout logic to use DotNetBuildFromSourceFlavor vs DotNetBuildOffline

 - Add CA nowarn workaround

 - --amend
2023-01-04 23:26:05 +00:00
Marc Paine
ffda9745d6
Merge pull request #15094 from dotnet/marcpopMSFT-cleanupnugets
Delete some test folders once run to not leave them on the machine
2022-12-13 16:39:17 -08:00