Commit graph

105 commits

Author SHA1 Message Date
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
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
Jason Zhai
fddba70df7 Switch 8.0 assets to the rtm release 2023-11-14 22:57:30 -08: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
Jason Zhai
f7cadeb3e0 Merge branch 'release/8.0.2xx' 2023-10-09 20:54:34 -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
a9c90a59a1 Install an 8.0 runtime
Enable the 8.0 default templates
2023-09-22 16:15:18 -07:00
Marc Paine
d5a2b52780 Add additional new tests to the exclusion list 2023-08-17 10:50:31 -07:00
Marc Paine
45cda7ffaa Update tests to skip list for unreleased runtimes 2023-08-16 09:23:20 -07:00
Marc Paine
b967d7961f
Disable a new sdk test that requires testassets.props to exist 2023-06-13 10:22:23 -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
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
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
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
Marc Paine
8a19c0b5c9 Switch to the rtm release version for templates.
Update the bundled versions

Open questions:
1. Does the source build global.json need to be updated too?
2. Why was Microsoft Extensions still 7.0?
2022-11-10 16:19:34 -08:00
Marc Paine
c8a33190e6
Merge branch 'main' into merge/release/7.0.1xx-to-main 2022-10-04 14:02:24 -07:00
Marc Paine
a3f54d61f0 Add back a few more exclusions 2022-09-16 13:30:52 -07:00
Marc Paine
ebd867dbb0 Add back another failing test. 2022-09-16 11:17:51 -07:00
Marc Paine
3cbbae829a Merge remote-tracking branch 'origin/release/7.0.1xx' into marcpopMSFT-reenabletests 2022-09-16 10:27:20 -07:00
Marc Paine
e371e5b548 Update to the just shiped RC1 version for all 7.0 templates and implicit versions. 2022-09-15 12:38:25 -07:00
Jason Zhai
dd1a8b6ec7 Merge branch 'release/7.0.1xx' 2022-09-14 23:21:35 -07:00
Jason Zhai
eab89c31eb Merge branch 'release/6.0.4xx' into release/7.0.1xx 2022-09-13 23:00:19 -07:00
Marc Paine
375f723a73 Revert to the latest version listed on the installer download page hoping the install scripts will work for that one. 2022-09-12 17:23:38 -07:00
Marc Paine
953b627c96 Update to the latest public rc1 versions of the runtimes. 2022-09-12 13:04:08 -07:00
Marc Paine
90e7e2b4a3 Try reenabling all the tests listed in the installer repo as a lot of them were disabled long ago. Let's see which pass. 2022-09-08 15:27:30 -07:00
Marc Paine
b409362aaf Merge pull request #14423 from dotnet/marcpopMSFT-implicitversion
Update implicit versions for the September release
2022-09-08 15:23:29 -07:00
Marc Paine
151b9412e8 Author in the 8.0 framework references
Update the tempalte references to handle the 7.0 version.
8.0 templates will come later.
2022-09-02 16:21:59 -07:00
Marc Paine
be22bc7844 Updated TestsToSkipPortableLinux.xml to add a similar test that failed for a similar reason. Likely related to ulimit 2022-08-19 19:11:05 +00:00
Marc Paine
ea23c6899d Updated TestsToSkipPortableLinux.xml to add a similar test that failed for a similar reason. Likely related to ulimit 2022-08-17 00:28:54 +00:00
kasperk81
242883eaf2
unset shell variables in single statement 2022-03-17 05:05:40 +02:00
dotnet-maestro[bot]
0d6d162bda
[main] Update dependencies from dotnet/sdk (#13192)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 7.0.0-preview.2.22107.1 to 7.0.0-preview.2.22115.3 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0: from 7.0.0-preview.2.22107.1 to 7.0.0-preview.2.22115.3 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0: from 7.0.0-preview.2.22107.1 to 7.0.0-preview.2.22115.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 7.0.0-preview.2.22103.2 to 7.0.0-preview.2.22116.9 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.TargetingPack.x64.7.0: from 7.0.0-preview.2.22103.2 to 7.0.0-preview.2.22116.9 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-preview.2.22103.2 to 7.0.0-preview.2.22116.9 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 7.0.0-preview.2.22103.2 to 7.0.0-preview.2.22116.9 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 7.0.0-preview.2.22103.2 to 7.0.0-preview.2.22116.9 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 7.0.0-preview.2.22103.2 to 7.0.0-preview.2.22116.9 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 7.0.0-preview.2.22107.8 to 7.0.0-preview.2.22114.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-preview.2.22107.8 to 7.0.0-preview.2.22114.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-preview.2.22107.8 to 7.0.0-preview.2.22114.6 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-preview.2.22107.8 to 7.0.0-preview.2.22114.6 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 7.0.0-preview.2.22107.8 to 7.0.0-preview.2.22114.6 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 7.0.0-preview.2.22107.8 to 7.0.0-preview.2.22114.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Common.ItemTemplates: from 7.0.100-preview.2.22077.4 to 7.0.100-preview.2.22116.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.TemplateEngine.Cli: from 7.0.100-preview.2.22077.4 to 7.0.100-preview.2.22116.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-preview.2.22107.1 to 7.0.0-preview.2.22115.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 7.0.0-preview.2.22106.3 to 7.0.0-preview.2.22114.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-preview.2.22107.1 to 7.0.0-preview.2.22115.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 7.0.0-preview.2.22107.1 to 7.0.0-preview.2.22115.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.NET.Test.Sdk: from 17.2.0-preview-20220207-08 to 17.2.0-preview-20220215-01 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.ILLink.Tasks: from 7.0.100-1.22107.1 to 7.0.100-1.22115.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 4.1.0-3.22068.11 to 4.2.0-1.22116.16 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-preview.2.22103.2 to 7.0.0-preview.2.22116.9 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.Workload.Emscripten.Manifest-7.0.100: from 7.0.0-alpha.2.22078.1 to 7.0.0-alpha.2.22111.1 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.7.0)

 - ignore errors and warnings in exec of dotnet new in SdkTests.csproj
2022-02-17 20:46:47 +00:00
Marc Paine
4629203942
Update SdkTests.csproj 2022-01-21 15:00:22 -08:00
Marc Paine
ae46ebfe5d
Update SdkTests.csproj 2022-01-13 10:50:19 -08:00
Jason Zhai
3d723365aa Merge branch 'release/6.0.1xx' into main 2021-10-28 23:16:31 -07:00
dotnet-maestro[bot]
a8febb40fc
[main] Update dependencies from dotnet/sdk (#12361)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 7.0.0-alpha.1.21474.1 to 7.0.0-alpha.1.21525.2 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21474.1 to 7.0.0-alpha.1.21525.2 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0: from 7.0.0-alpha.1.21474.1 to 7.0.0-alpha.1.21525.2 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21480.1 to 7.0.0-alpha.1.21524.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 7.0.0-alpha.1.21480.1 to 7.0.0-alpha.1.21524.4 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.TargetingPack.x64.7.0: from 7.0.0-alpha.1.21480.1 to 7.0.0-alpha.1.21524.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21480.1 to 7.0.0-alpha.1.21524.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 7.0.0-alpha.1.21480.1 to 7.0.0-alpha.1.21524.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 7.0.0-alpha.1.21480.1 to 7.0.0-alpha.1.21524.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 7.0.0-alpha.1.21480.1 to 7.0.0-alpha.1.21524.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 7.0.0-alpha.1.21470.28 to 7.0.0-alpha.1.21514.17 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-alpha.1.21470.28 to 7.0.0-alpha.1.21514.17 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21470.28 to 7.0.0-alpha.1.21514.17 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21470.28 to 7.0.0-alpha.1.21514.17 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 7.0.0-alpha.1.21470.28 to 7.0.0-alpha.1.21514.17 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 7.0.0-alpha.1.21470.28 to 7.0.0-alpha.1.21514.17 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Common.ItemTemplates: from 7.0.100-alpha.1.21463.5 to 7.0.100-alpha.1.21522.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.TemplateEngine.Cli: from 7.0.100-alpha.1.21463.5 to 7.0.100-alpha.1.21522.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-alpha.1.21474.1 to 7.0.0-alpha.1.21525.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-rc.2.21459.12 to 7.0.0-alpha.1.21525.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-alpha.1.21474.1 to 7.0.0-alpha.1.21525.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 7.0.0-alpha.1.21460.1 to 7.0.0-alpha.1.21525.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.FSharp.Compiler: from 12.0.0-beta.21477.4 to 12.0.0-beta.21522.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.SourceBuild.Intermediate.fsharp: from 6.0.0-beta.21477.4 to 6.0.1-beta.21522.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.Test.Sdk: from 17.0.0-release-20210908-02 to 17.1.0-preview-20211012-05 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.ILLink.Tasks: from 7.0.100-1.21479.1 to 7.0.100-1.21525.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 4.0.0-5.21479.8 to 4.0.0-6.21521.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.Build: from 17.0.0-preview-21480-01 to 17.1.0-preview-21522-03 (parent: Microsoft.NET.Sdk)
  - NuGet.Build.Tasks: from 6.0.0-rc.258 to 6.0.0-rc.278 (parent: Microsoft.NET.Sdk)
  - Microsoft.SourceBuild.Intermediate.source-build: from 0.1.0-alpha.1.21460.1 to 0.1.0-alpha.1.21475.1 (parent: Microsoft.NET.Sdk)

 - Add nuget package refs for tests

 - Attempt changing the installer target framework

 -  Revert "Add nuget package refs for tests"

This reverts commit d7ceaf16350ca3b28e2fc52d729db431ef46899d.

 - Update stage0 to an SDK that supports the 7.0 TFM

 - Use stage 2 dotnet for installing and running SDK tests
2021-10-26 00:59:19 +00:00