Commit graph

33858 commits

Author SHA1 Message Date
Jason Zhai
ad4b1f7f5f Merge branch 'release/8.0.1xx' of https://github.com/dotnet/installer into darc-release/8.0.1xx-efeecded-8d43-4822-8880-b04a4cda4cff 2023-11-16 22:38:58 -08:00
v-wuzhai
ca25bb228c
[automated] Merge branch 'release/7.0.3xx' => 'release/7.0.4xx' (#17826) 2023-11-16 22:22:32 -08:00
Jason Zhai
9db3533897 Merge branch 'release/8.0.1xx' into release/8.0.2xx 2023-11-16 22:11:19 -08:00
Jason Zhai
4eaa6052e2 Merge branch 'release/7.0.3xx' into release/7.0.4xx 2023-11-16 18:58:05 -08:00
v-wuzhai
5d396b5b27
[main] Update dependencies from dotnet/arcade (#17815) 2023-11-16 18:27:04 -08:00
v-wuzhai
d9a8439ecb
[release/8.0.1xx] Update dependencies from dotnet/source-build-reference-packages (#17816) 2023-11-16 18:26:22 -08:00
v-wuzhai
e99dd26c1a
[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.3xx' (#17802) 2023-11-16 18:08:00 -08:00
dotnet-maestro[bot]
9a20740764 Update dependencies from https://github.com/dotnet/source-build-externals build 20231116.2
Microsoft.SourceBuild.Intermediate.source-build-externals
 From Version 8.0.0-alpha.1.23518.1 -> To Version 8.0.0-alpha.1.23566.2
2023-11-16 21:21:06 +00:00
Nikola Milosavljevic
4e9256ffb4
Use unique non-stable SDK version for comparison test (#17819) 2023-11-16 11:41:04 -08:00
Daniel Plaisted
97a31dd18c
Downgrade implicit version (#17762) 2023-11-16 13:45:16 -05:00
Viktor Hofer
5037a63d97
Consume portable RID graph from runtime (#17760) 2023-11-16 17:40:29 +01:00
dotnet-maestro[bot]
eae1413076
[main] Update dependencies from dotnet/sdk (#17813)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 9.0.0-alpha.1.23565.1 to 9.0.0-alpha.1.23565.9 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0: from 9.0.0-alpha.1.23565.1 to 9.0.0-alpha.1.23565.9 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0: from 9.0.0-alpha.1.23565.1 to 9.0.0-alpha.1.23565.9 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-alpha.1.23565.14 to 9.0.0-alpha.1.23565.25 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 9.0.0-alpha.1.23565.14 to 9.0.0-alpha.1.23565.25 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.TargetingPack.x64.9.0: from 9.0.0-alpha.1.23565.14 to 9.0.0-alpha.1.23565.25 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 9.0.0-alpha.1.23565.14 to 9.0.0-alpha.1.23565.25 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 9.0.0-alpha.1.23565.14 to 9.0.0-alpha.1.23565.25 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 9.0.0-alpha.1.23565.11 to 9.0.0-alpha.1.23565.13 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 9.0.0-alpha.1.23565.11 to 9.0.0-alpha.1.23565.13 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 9.0.0-alpha.1.23565.11 to 9.0.0-alpha.1.23565.13 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0: from 9.0.0-alpha.1.23565.11 to 9.0.0-alpha.1.23565.13 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 9.0.0-alpha.1.23565.11 to 9.0.0-alpha.1.23565.13 (parent: Microsoft.NET.Sdk)
  - dotnet-user-jwts: from 9.0.0-alpha.1.23565.11 to 9.0.0-alpha.1.23565.13 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 9.0.0-alpha.1.23565.11 to 9.0.0-alpha.1.23565.13 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 9.0.0-alpha.1.23565.1 to 9.0.0-alpha.1.23565.9 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 9.0.0-alpha.1.23563.7 to 9.0.0-alpha.1.23564.17 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 9.0.0-alpha.1.23565.1 to 9.0.0-alpha.1.23565.9 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 9.0.0-alpha.1.23564.1 to 9.0.0-alpha.1.23565.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.NET.ILLink.Tasks: from 9.0.0-alpha.1.23565.14 to 9.0.0-alpha.1.23565.25 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-alpha.1.23565.14 to 9.0.0-alpha.1.23565.25 (parent: Microsoft.NET.Sdk)
2023-11-16 15:43:49 +00:00
Jonathan Peppers
5e315c84d5
Update .NET 8 GA MAUI baseline manifests (#17794)
These are the releases on NuGet.org that shipped on 11/14.
2023-11-16 07:48:08 -06:00
dotnet-maestro[bot]
a944bbe582 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20231115.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 8.0.0-alpha.1.23556.3 -> To Version 8.0.0-alpha.1.23565.1
2023-11-16 13:38:49 +00:00
dotnet-maestro[bot]
25862ef907 Update dependencies from https://github.com/dotnet/arcade build 20231115.1
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.XliffTasks
 From Version 9.0.0-beta.23564.3 -> To Version 9.0.0-beta.23565.1
2023-11-16 13:17:10 +00:00
Jason Zhai
8bb5517ac0 Merge branch 'release/7.0.1xx' into release/7.0.3xx 2023-11-15 22:05:26 -08:00
dotnet-maestro[bot]
29adc59330
[main] Update dependencies from dotnet/sdk (#17812)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-alpha.1.23565.6 to 9.0.0-alpha.1.23565.14 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 9.0.0-alpha.1.23565.6 to 9.0.0-alpha.1.23565.14 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.TargetingPack.x64.9.0: from 9.0.0-alpha.1.23565.6 to 9.0.0-alpha.1.23565.14 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 9.0.0-alpha.1.23565.6 to 9.0.0-alpha.1.23565.14 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 9.0.0-alpha.1.23565.6 to 9.0.0-alpha.1.23565.14 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 9.0.0-alpha.1.23565.4 to 9.0.0-alpha.1.23565.11 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 9.0.0-alpha.1.23565.4 to 9.0.0-alpha.1.23565.11 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 9.0.0-alpha.1.23565.4 to 9.0.0-alpha.1.23565.11 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0: from 9.0.0-alpha.1.23565.4 to 9.0.0-alpha.1.23565.11 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 9.0.0-alpha.1.23565.4 to 9.0.0-alpha.1.23565.11 (parent: Microsoft.NET.Sdk)
  - dotnet-user-jwts: from 9.0.0-alpha.1.23565.4 to 9.0.0-alpha.1.23565.11 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 9.0.0-alpha.1.23565.4 to 9.0.0-alpha.1.23565.11 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.ILLink.Tasks: from 9.0.0-alpha.1.23565.6 to 9.0.0-alpha.1.23565.14 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-alpha.1.23565.6 to 9.0.0-alpha.1.23565.14 (parent: Microsoft.NET.Sdk)
2023-11-16 05:49:16 +00:00
dotnet-maestro[bot]
61ebcccd30
[main] Update dependencies from dotnet/sdk (#17746)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 9.0.0-alpha.1.23558.4 to 9.0.0-alpha.1.23565.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0: from 9.0.0-alpha.1.23558.4 to 9.0.0-alpha.1.23565.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0: from 9.0.0-alpha.1.23558.4 to 9.0.0-alpha.1.23565.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-alpha.1.23558.17 to 9.0.0-alpha.1.23565.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 9.0.0-alpha.1.23558.17 to 9.0.0-alpha.1.23565.6 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.TargetingPack.x64.9.0: from 9.0.0-alpha.1.23558.17 to 9.0.0-alpha.1.23565.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 9.0.0-alpha.1.23558.17 to 9.0.0-alpha.1.23565.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 9.0.0-alpha.1.23558.17 to 9.0.0-alpha.1.23565.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 9.0.0-alpha.1.23558.19 to 9.0.0-alpha.1.23565.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 9.0.0-alpha.1.23558.19 to 9.0.0-alpha.1.23565.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 9.0.0-alpha.1.23558.19 to 9.0.0-alpha.1.23565.4 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0: from 9.0.0-alpha.1.23558.19 to 9.0.0-alpha.1.23565.4 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 9.0.0-alpha.1.23558.19 to 9.0.0-alpha.1.23565.4 (parent: Microsoft.NET.Sdk)
  - dotnet-user-jwts: from 9.0.0-alpha.1.23558.19 to 9.0.0-alpha.1.23565.4 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 9.0.0-alpha.1.23558.19 to 9.0.0-alpha.1.23565.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 9.0.0-alpha.1.23558.4 to 9.0.0-alpha.1.23565.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 9.0.0-alpha.1.23557.11 to 9.0.0-alpha.1.23563.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 9.0.0-alpha.1.23558.4 to 9.0.0-alpha.1.23565.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 9.0.0-alpha.1.23558.1 to 9.0.0-alpha.1.23564.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.FSharp.Compiler: from 12.8.0-beta.23556.4 to 12.8.0-beta.23563.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.SourceBuild.Intermediate.fsharp: from 8.0.200-beta.23556.4 to 8.0.200-beta.23563.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.Test.Sdk: from 17.9.0-preview-23557-03 to 17.9.0-preview-23564-03 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.ILLink.Tasks: from 9.0.0-alpha.1.23558.17 to 9.0.0-alpha.1.23565.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 4.9.0-2.23558.4 to 4.9.0-2.23563.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.Build: from 17.9.0-preview-23557-02 to 17.9.0-preview-23565-01 (parent: Microsoft.NET.Sdk)
  - NuGet.Build.Tasks: from 6.9.0-preview.1.23 to 6.9.0-preview.1.33 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-alpha.1.23558.17 to 9.0.0-alpha.1.23565.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport: from 9.0.0-alpha.1.23530.1 to 9.0.0-alpha.1.23564.1 (parent: Microsoft.NETCore.App.Runtime.win-x64)

 - Merge branch 'main' into darc-main-a32af26c-4b45-4f88-988a-82c2e1fb29cc

 - Merge branch 'main' into darc-main-a32af26c-4b45-4f88-988a-82c2e1fb29cc

 - Merge branch 'main' into darc-main-a32af26c-4b45-4f88-988a-82c2e1fb29cc

 - Update source-mappings.json

 - Update allowed-binaries.txt

 - Remove backported nuget patch

 - Merge branch 'main' into darc-main-a32af26c-4b45-4f88-988a-82c2e1fb29cc
2023-11-16 02:08:50 +00:00
v-wuzhai
d98dbc99b9
[release/7.0.1xx] Update dependencies from dotnet/arcade (#17808) 2023-11-15 18:07:39 -08:00
Viktor Hofer
2c325fb634
Fix merge conflict in sdk.proj (#17810) 2023-11-15 21:02:22 +00:00
Jo Shields
9bc4ef9c73
Pass PortableBuild property through to runtime in VMR (#17804) 2023-11-15 13:50:21 -05:00
dotnet-maestro[bot]
121675dfa1 Update dependencies from https://github.com/dotnet/arcade build 20231114.5
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.23511.9 -> To Version 7.0.0-beta.23564.5
2023-11-15 18:33:22 +00:00
Noah Gilson
97fc62d580
[release/8.0.1xx] Update dependencies from dotnet/arcade (#17805) 2023-11-15 10:14:58 -08:00
Noah Gilson
09a71808d7
[main] Update dependencies from dotnet/arcade (#17799) 2023-11-15 10:14:50 -08:00
dotnet-maestro[bot]
9eec423049
[release/8.0.2xx] Update dependencies from dotnet/arcade (#17803)
[release/8.0.2xx] Update dependencies from dotnet/arcade
2023-11-15 18:14:49 +00:00
dotnet-maestro[bot]
34c17fa0e0
[main] Update dependencies from dotnet/source-build-reference-packages (#17801)
[main] Update dependencies from dotnet/source-build-reference-packages
2023-11-15 18:14:18 +00:00
Noah Gilson
11e80f30f6
[automated] Merge branch 'release/8.0.1xx' => 'release/8.0.2xx' (#17787) 2023-11-15 09:48:53 -08:00
Noah Gilson
67ab6b6bb5
[automated] Merge branch 'release/8.0.2xx' => 'main' (#17775) 2023-11-15 09:48:05 -08:00
dotnet-maestro[bot]
5ec5ab4fee Update dependencies from https://github.com/dotnet/arcade build 20231114.4
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 8.0.0-beta.23556.5 -> To Version 8.0.0-beta.23564.4
2023-11-15 16:47:05 +00:00
NET Source-Build Bot
c09863189d
.NET Source-Build 7.0.114 November 2023 Updates (#17780) 2023-11-15 16:19:55 +00:00
dotnet-maestro[bot]
6c3c54286d Update dependencies from https://github.com/dotnet/arcade build 20231114.3
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.XliffTasks
 From Version 9.0.0-beta.23563.1 -> To Version 9.0.0-beta.23564.3
2023-11-15 13:16:47 +00:00
Jason Zhai
e641a47a9f Merge branch 'release/8.0.2xx' 2023-11-15 00:54:28 -08:00
Jason Zhai
4d9502e916 No need to subtract one when the brand version is 0 2023-11-15 00:25:48 -08:00
Jason Zhai
87b787239d Merge branch 'release/8.0.1xx' into release/8.0.2xx 2023-11-14 23:40:54 -08:00
Jason Zhai
f06dc115c1 Merge branch 'main' of https://github.com/dotnet/installer into Jason/Update-8.0-assets 2023-11-14 22:59:23 -08:00
Jason Zhai
fddba70df7 Switch 8.0 assets to the rtm release 2023-11-14 22:57:30 -08:00
v-wuzhai
dccd713909
[main] Update dependencies from dotnet/source-build-reference-packages (#17788) 2023-11-14 22:40:37 -08:00
v-wuzhai
94d67600f3
[release/7.0.3xx] Update dependencies from dotnet/arcade (#17795) 2023-11-14 22:28:23 -08:00
v-wuzhai
8c99a8885c
[release/7.0.4xx] Update dependencies from dotnet/arcade (#17796) 2023-11-14 22:28:02 -08:00
dotnet-maestro[bot]
98f6291942 Update dependencies from https://github.com/dotnet/arcade build 20231114.5
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.23556.6 -> To Version 7.0.0-beta.23564.5
2023-11-14 23:30:42 +00:00
dotnet-maestro[bot]
bacd200ed7 Update dependencies from https://github.com/dotnet/arcade build 20231114.5
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.23556.6 -> To Version 7.0.0-beta.23564.5
2023-11-14 23:30:42 +00:00
Noah Gilson
e2f576f840
[release/8.0.1xx] Update dependencies from dotnet/arcade (#17635) 2023-11-14 15:20:35 -08:00
Marc Paine
2eb4a6adbb
Merging internal commits for release/7.0.1xx (#17783) 2023-11-14 14:06:10 -08:00
Marc Paine
78bce6ca28
Merging internal commits for release/7.0.3xx (#17782) 2023-11-14 14:06:07 -08:00
Marc Paine
c001cbb4df
Merging internal commits for release/7.0.4xx (#17776) 2023-11-14 14:05:54 -08:00
NET Source-Build Bot
e94d69fbe7
.NET Source-Build 8.0.100 November 2023 Updates (#17784) 2023-11-14 15:36:29 -06:00
dotnet-maestro[bot]
921c8c1b5c Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20231114.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 9.0.0-alpha.1.23563.2 -> To Version 9.0.0-alpha.1.23564.1
2023-11-14 20:18:03 +00:00
Noah Gilson
7be3f8efa3
[release/8.0.1xx] Update dependencies from dotnet/source-build-reference-packages (#17708) 2023-11-14 11:47:29 -08:00
Sean Reeser
33c86a3b3d Merge commit 'b2a71039cd0ad21507999d0d722e558e3ea61ca2' into internal-merge-7.0.1xx-2023-11-14-1054 2023-11-14 10:54:37 -08:00
Sean Reeser
e230a993d9 Merge commit '3d9518d8853e9cae6bab2d9460a4ce827dc89b43' into internal-merge-7.0.3xx-2023-11-14-1054 2023-11-14 10:54:28 -08:00