Commit graph

2436 commits

Author SHA1 Message Date
kasperk81
6d9d25aae3
remove xml declarations (#19339) 2024-04-07 08:53:48 +02:00
Michael Yanni
5a9e492894 Added Valleysoft.DockerCredsProvider.dll exclusion back as it is necessary. Updated or removed TODO comments. Fixed some tabbing from merging. Fixed a compilation bug if this code is ever built against 4.5.1(????) 2024-02-28 12:12:30 -08:00
Michael Yanni
34c7829222 Merge branch 'feature/installer-merge-update-main' into feature/installer-merge-update
# Conflicts:
#	eng/Version.Details.xml
#	eng/Versions.props
#	global.json
#	src/redist/redist.csproj
#	src/redist/targets/BundledDotnetTools.targets
#	src/redist/targets/BundledTemplates.targets
#	src/redist/targets/Crossgen.targets
#	src/redist/targets/GenerateArchives.targets
#	src/redist/targets/GenerateLayout.targets
#	src/redist/targets/GeneratePKG.targets
#	test/SdkTests/SdkTests.csproj
2024-02-27 13:09:06 -08:00
Marc Paine
6d1abb7414
[automated] Merge branch 'release/8.0.3xx' => 'main' (#18544) 2024-02-15 13:29:00 -08:00
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
Matt Mitchell
0368ac38f7
Download artifacts in parallel (#18549) 2024-02-07 17:05:52 +01:00
Jason Zhai
8fc700cbf0 Merge branch 'release/8.0.3xx' 2024-02-06 22:29:26 -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
Marc Paine
700b78e1fd add an additional test to disable 2024-02-01 12:50:53 -08:00
Marc Paine
6409fc11b8 Fix the file rename 2024-02-01 12:50:45 -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
Marc Paine
8a35ac3fbb Rename the XML file
Add a specific test back to the exclusion list
Move two tests to the linux-only exclusion list
2024-01-26 15:00:35 -08:00
Marc Paine
84ea85192b Separate out the test exclusions that apply to stable SDKs when we're targeting the latest downlevel runtime.
This should simplify things as we want to run these tests at least some of the time but codeflow ends up removing them.
2024-01-26 11:46:10 -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