Commit graph

2426 commits

Author SHA1 Message Date
Michael Yanni
9424463a43 Fix CalculateTemplateVerionsTests to access the properties of the return type for comparison since a ValueTuple is no longer used. 2024-02-07 11:27:29 -08:00
Michael Yanni
8e86e03d37 Fix missing single quote in SdkTests.csproj. 2024-02-06 14:12:13 -08:00
Michael Yanni
23d9262638 General formatting and cleanup. Removed GivenThatWeWantToRunCrossgen from SdkTests as it hasn't existed in years...? 2024-02-05 16:27:06 -08:00
Michael Yanni
69787b8b88 Merge branch 'feature/installer-merge-update-main' into feature/installer-merge-update
# Conflicts:
#	eng/Version.Details.xml
#	eng/Versions.props
#	global.json
#	src/redist/targets/Crossgen.targets
#	src/redist/targets/GenerateBundledVersions.targets
#	src/redist/targets/GenerateLayout.targets
#	src/redist/targets/GenerateMSIs.targets
2024-01-29 14:04:18 -08:00
Jason Zhai
9383d2ea30 Merge branch 'release/8.0.3xx' 2024-01-17 18:55:17 -08:00
Marc Paine
89a709f0c0
disable test that targets 6.0 2024-01-12 13:45:15 -08:00
Forgind
5bfcb0cf50 Merge branch 'baseline-manifest' of https://github.com/Forgind/installer into baseline-manifest-8.0.2 2023-12-19 12:07:04 -08:00
dotnet-maestro[bot]
c947c12af4
[main] Update dependencies from dotnet/sdk (#17875)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: JL03-Yue <59816815+JL03-Yue@users.noreply.github.com>
Co-authored-by: Larry Ewing <lewing@microsoft.com>
Co-authored-by: Matt Thalman <mthalman@microsoft.com>
Co-authored-by: Marek Safar <marek.safar@gmail.com>
2023-12-13 11:57:28 +01:00
Michael Yanni
a4235dc472 Move DownloadPackage.csproj to the projects directory for redist. Clean up formatting in SdkTests.csproj. Removed the empty <TargetPath></TargetPath> from SdkTests.csproj to allow loading in VS. 2023-12-12 18:19:48 -08:00
dotnet-maestro[bot]
48b005c37a
[release/8.0.2xx] Update dependencies from dotnet/sdk (#17695)
[release/8.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 8.0.0-rtm.23521.1 to 8.0.0 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0: from 8.0.0-rtm.23521.1 to 8.0.0-rtm.23551.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0: from 8.0.0-rtm.23521.1 to 8.0.0-rtm.23551.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 8.0.0-rtm.23520.10 to 8.0.0 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 8.0.0-rtm.23520.10 to 8.0.0-rtm.23531.12 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 8.0.0-rtm.23520.10 to 8.0.0 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0: from 8.0.0-rtm.23520.10 to 8.0.0-rtm.23531.12 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 8.0.0-rtm.23520.10 to 8.0.0-rtm.23531.12 (parent: Microsoft.NET.Sdk)
  - dotnet-user-jwts: from 8.0.0-rtm.23520.10 to 8.0.0-rtm.23531.12 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 8.0.0-rtm.23520.10 to 8.0.0-rtm.23531.12 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-rtm.23521.1 to 8.0.0 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 8.0.0-rtm.23520.14 to 8.0.0-rtm.23531.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-rtm.23521.1 to 8.0.0 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 8.0.0-rtm.23521.1 to 8.0.0-rtm.23531.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.FSharp.Compiler: from 12.8.0-beta.23523.2 to 12.8.0-beta.23579.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.SourceBuild.Intermediate.fsharp: from 8.0.200-beta.23523.2 to 8.0.200-beta.23579.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.Test.Sdk: from 17.9.0-preview-23519-02 to 17.9.0-preview-23580-01 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 4.9.0-1.23520.1 to 4.9.0-2.23562.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.Build: from 17.9.0-preview-23523-01 to 17.9.0-preview-23601-02 (parent: Microsoft.NET.Sdk)
  - NuGet.Build.Tasks: from 6.9.0-preview.1.17 to 6.9.0-preview.1.45 (parent: Microsoft.NET.Sdk)

 - Merge branch 'release/8.0.2xx' into darc-release/8.0.2xx-db92f0fc-3348-4e4e-afc8-b90a040a28d4

 - Remove 8.0.100 feed from 8.0.200

 - Merge branch 'release/8.0.2xx' into darc-release/8.0.2xx-db92f0fc-3348-4e4e-afc8-b90a040a28d4

 - Merge branch 'release/8.0.2xx' into darc-release/8.0.2xx-db92f0fc-3348-4e4e-afc8-b90a040a28d4

 - Merge branch 'release/8.0.2xx' into darc-release/8.0.2xx-db92f0fc-3348-4e4e-afc8-b90a040a28d4

 - Merge branch 'release/8.0.2xx' into darc-release/8.0.2xx-db92f0fc-3348-4e4e-afc8-b90a040a28d4

 - Merge branch 'release/8.0.2xx' into darc-release/8.0.2xx-db92f0fc-3348-4e4e-afc8-b90a040a28d4

 - Fix the emsdk coherency and rerun the dependency update for the SKD build

 - Updating the dotnet new output to match current behavior

Teams message sent to confirm if this is correct

 - Fix emsdk Dependency
2023-12-04 15:41:28 +00:00
Jason Zhai
fddba70df7 Switch 8.0 assets to the rtm release 2023-11-14 22:57:30 -08:00
Michael Yanni
32c3e4e8d0 Minor simplification and cleanup. The record I created didn't work for the 4.7.2 build, so changed it to class. 2023-11-13 13:20:00 -08:00
Michael Yanni
b25079d9e6 Lots of minor cleanup and simplification. 2023-11-10 17:50:52 -08:00
Michael Yanni
c42fb4c641 Cleanup extra qualification. Cleanup redundant casting. Cleanup usings. Set var suggestion to none. 2023-11-10 17:23:47 -08:00
Michael Yanni
67cbc0dd65 Applied expression bodies for methods to solution. 2023-11-10 17:08:10 -08:00
Michael Yanni
c9ab438e6c Remove no longer applicable workaround in run-build.ps1. Applied expression bodied properties to solution. 2023-11-10 17:07:05 -08:00
Codrin-Victor Poienaru
00178e6f21
Insert net9.0 test templates (#17745) 2023-11-09 09:52:19 -08:00
Marc Paine
8022c5e9e8 Enable 9.0 SDK templates 2023-11-01 13:53:02 -07:00
Marc Paine
d712505e09 Enable the 9.0 templates 2023-10-31 11:31:16 -07:00
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