mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
26221 commits 41 branches 190 tags 95 MiB
Commit graph

26221 commits

This branch
This branch
All branches
Author SHA1 Message Date
dotnet-bot
cd4fd1f182 Merge in 'release/7.0.1xx' changes 2022-10-13 13:16:39 +00:00
Logan Bussell
d41bfecf50
[release/7.0.1xx] Port dotnet-watch smoke test fixes (#14738) 
* [release/6.0.1xx] Re-write dotnet-watch smoke test (#14367)

* Re-write dotnet-watch smoke test

* Revert async changes

* Re-enable dotnet-watch test
 2022-10-13 08:05:35 -05:00
dotnet-bot
cbfaafcfa6 Merge in 'release/7.0.1xx' changes 2022-10-13 02:33:36 +00:00
v-wuzhai
5d80bf0a65
Merge pull request #14737 from dotnet-maestro-bot/merge/release/6.0.4xx-to-release/7.0.1xx 
[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx'
 2022-10-12 19:24:26 -07:00
dotnet-bot
fb0b3e448f Merge in 'release/7.0.1xx' changes 2022-10-13 01:27:01 +00:00
William Godbe
9a76ba2452
Update asp.net templates (#14689) 2022-10-13 01:16:20 +00:00
Marc Paine
185c87b36c
Merge branch 'release/7.0.1xx' into merge/release/6.0.4xx-to-release/7.0.1xx 2022-10-12 15:32:32 -07:00
dotnet-bot
7895b716e0 Merge in 'release/7.0.1xx' changes 2022-10-12 21:44:16 +00:00
Marc Paine
f982f388ce
Merge pull request #14718 from dotnet/nagilson-tempfix-7.0.1xx 
[7.0.1xx] Use mktemp to correctly use temp files
 2022-10-12 14:33:13 -07:00
dotnet-bot
db70a78dbb Merge in 'release/7.0.1xx' changes 2022-10-12 20:40:32 +00:00
dotnet-maestro[bot]
9bb8d116b0
[release/7.0.1xx] Update dependencies from dotnet/sdk (#14725) 
[release/7.0.1xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 7.0.0-rtm.22507.2 to 7.0.0 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0: from 7.0.0-rtm.22507.2 to 7.0.0-rtm.22511.3 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0: from 7.0.0-rtm.22507.2 to 7.0.0-rtm.22511.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 7.0.0-rtm.22507.1 to 7.0.0-rtm.22511.4 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.TargetingPack.x64.7.0: from 7.0.0-rtm.22507.1 to 7.0.0-rtm.22511.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-rtm.22507.1 to 7.0.0-rtm.22511.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 7.0.0-rtm.22507.1 to 7.0.0-rtm.22511.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 7.0.0-rtm.22507.1 to 7.0.0-rtm.22511.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 7.0.0-rtm.22507.1 to 7.0.0-rtm.22511.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 7.0.0-rtm.22504.29 to 7.0.0-rtm.22512.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-rtm.22504.29 to 7.0.0-rtm.22512.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-rtm.22504.29 to 7.0.0-rtm.22512.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-rtm.22504.29 to 7.0.0-rtm.22512.1 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 7.0.0-rtm.22504.29 to 7.0.0-rtm.22512.1 (parent: Microsoft.NET.Sdk)
  - dotnet-user-jwts: from 7.0.0-rtm.22504.29 to 7.0.0-rtm.22512.1 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 7.0.0-rtm.22504.29 to 7.0.0-rtm.22512.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-rtm.22507.2 to 7.0.0 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 7.0.0-rtm.22506.1 to 7.0.0-rtm.22511.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-rtm.22507.2 to 7.0.0 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 7.0.0-rtm.22506.9 to 7.0.0-rtm.22511.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.FSharp.Compiler: from 12.0.5-beta.22507.6 to 12.0.5-beta.22510.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.SourceBuild.Intermediate.fsharp: from 7.0.0-beta.22507.6 to 7.0.0-beta.22510.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 4.4.0-3.22507.1 to 4.4.0-3.22511.14 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-rtm.22507.1 to 7.0.0-rtm.22511.4 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-rtm.22507.1 to 7.0.0-rtm.22511.4 (parent: Microsoft.NET.Sdk)

 - Remove backported source-build patches

 - Merge branch 'release/7.0.1xx' of https://github.com/dotnet/installer into darc-release/7.0.1xx-629cfea0-7f3f-4b78-b783-1b6dc7af9224
 2022-10-12 20:29:30 +00:00
Marc Paine
bc84fe8d35
Merge pull request #14721 from dotnet-maestro-bot/merge/release/6.0.3xx-to-release/6.0.4xx 
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx'
 2022-10-12 11:19:28 -07:00
dotnet-bot
64e7d437f7 Merge in 'release/7.0.1xx' changes 2022-10-12 15:21:27 +00:00
Marc Paine
93dd7d6622
Stable branding (#14729) 2022-10-12 08:11:05 -07:00
Jason Zhai
0d31263c5b Merge branch 'release/6.0.3xx' into release/6.0.4xx 2022-10-12 00:13:19 -07:00
dotnet-bot
8a5b3afe6f Merge in 'release/7.0.1xx' changes 2022-10-12 00:57:50 +00:00
Logan Bussell
f3606a0adb
[release/7.0.1xx] .NET Source-Build 7.0.100-rc.2 October 2022 Updates (#14728) 
* Update source-build to 7.0 RC2

* Also update tarball global.json

* Don't touch root global.json in case it is managed by automation
 2022-10-12 00:46:30 +00:00
dotnet-bot
e51decb34a Merge in 'release/7.0.1xx' changes 2022-10-11 21:49:50 +00:00
Michael Simons
5633822a17
Update patch backport comments and remove obsolete patch (#14710) 2022-10-11 16:37:36 -05:00
dotnet-bot
8774471627 Merge in 'release/7.0.1xx' changes 2022-10-11 20:20:30 +00:00
Chris Rummel
c516635aef
Don't use the MSBuild server process for init-build.proj. (#14643) 
* Don't use the MSBuild server process for init-build.proj.
This appears to fix an issue where our SdkResolver is not loaded because there are still lingering dotnet processes when we try to binplace the resolver DLL.

* Address code review feedback.
 2022-10-11 15:08:43 -05:00
Marc Paine
2d21c668bb
Merge pull request #14716 from dotnet-maestro-bot/merge/release/6.0.1xx-to-release/6.0.3xx 
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx'
 2022-10-11 13:00:09 -07:00
Noah Gilson
12ce4c5732 use mktemp to correctly use temp files 2022-10-11 12:28:02 -07:00
dotnet-bot
661749c467 Merge in 'release/7.0.1xx' changes 2022-10-11 18:49:19 +00:00
Chris Rummel
b389d53439
Add support for using --with-packages with smoke-tests. (#14387) (#14587) 
* Add support for using --with-packages with smoke-tests.

* Use a better variable name for custom packages directory.

* Swap conditions so we don't have to delete the archive directory.  Fixes https://github.com/dotnet/source-build/issues/2900.

* Update src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs

Co-authored-by: Michael Simons <msimons@microsoft.com>

* Address review feedback.

Co-authored-by: Michael Simons <msimons@microsoft.com>

Co-authored-by: Michael Simons <msimons@microsoft.com>
 2022-10-11 13:43:26 -05:00
dotnet-maestro[bot]
9e046a5203
[release/7.0.1xx] Update dependencies from dotnet/sdk (#14705) 
[release/7.0.1xx] Update dependencies from dotnet/sdk


 - Remove backported command-line-api patch
 2022-10-11 18:37:57 +00:00
dotnet-bot
536502a46c Merge in 'release/7.0.1xx' changes 2022-10-11 18:11:52 +00:00
Chris Rummel
ad6737a1c5
Remove llvm-project from source-build as we have removed this dependency in runtime. (#14697) 
* Remove llvm-project from source-build as we have removed this dependency in runtime.

* Add patch for the backport PR to get this to build for now.

* Remove unneeded copy of this patch.
 2022-10-11 17:51:12 +00:00
dotnet-bot
bde372f45f Merge in 'release/7.0.1xx' changes 2022-10-11 17:45:26 +00:00
Swapnali911
7536a025fa
Adding ppc64le arch for source build (#14631) 2022-10-11 12:31:15 -05:00
Marc Paine
f1161af25c
Merge pull request #14477 from ayakael/backports/pr-12516-to-release/6.0.1xx 
[release/6.0.1xx] GetRuntimeInformation.targets: determine PortableProductMonikerRid based on OSName and Architecture. (backports #12516)
 2022-10-11 10:24:07 -07:00
dotnet-bot
8cbd527db7 Merge in 'release/7.0.1xx' changes 2022-10-11 02:53:15 +00:00
v-wuzhai
574e6f90fc
Merge pull request #14701 from dotnet/darc-release/7.0.1xx-65fc3186-e01f-4c64-b4fe-a09ca1a9296d 
[release/7.0.1xx] Update dependencies from dotnet/sdk
 2022-10-10 19:42:18 -07:00
dotnet-maestro[bot]
ffedce380b Update dependencies from https://github.com/dotnet/sdk build 20221010.16 
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.100-rtm.22507.25 -> To Version 7.0.100-rtm.22510.16

Dependency coherency updates

Microsoft.Net.Compilers.Toolset
 From Version 4.4.0-3.22505.18 -> To Version 4.4.0-3.22507.1 (parent: Microsoft.NET.Sdk
 2022-10-10 23:29:44 +00:00
dotnet-maestro[bot]
5449eb59d3 Update dependencies from https://github.com/dotnet/sdk build 20221010.10 
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.100-rtm.22507.25 -> To Version 7.0.100-rtm.22510.10

Dependency coherency updates

Microsoft.Net.Compilers.Toolset
 From Version 4.4.0-3.22505.18 -> To Version 4.4.0-3.22507.1 (parent: Microsoft.NET.Sdk
 2022-10-10 21:01:47 +00:00
dotnet-bot
846770d1d9 Merge in 'release/7.0.1xx' changes 2022-10-10 20:13:15 +00:00
Nikola Milosavljevic
2016f37c65
Merge pull request #14698 from NikolaMilosavljevic/sl.1.latest 
Enable source-link in SourceBuild
 2022-10-10 13:01:27 -07:00
dotnet-bot
57c054d43e Merge in 'release/7.0.1xx' changes 2022-10-10 18:57:39 +00:00
Michael Simons
18a6bff6a6
Fix source-build CI to not run tarball build when tarball creation fails (#14678) 
* Fix source-build CI to not run tarball build when tarball creation failed

* Bad fix

* Revert test patch
 2022-10-10 13:46:25 -05:00
dotnet-maestro[bot]
e1d19eb3fa Update dependencies from https://github.com/dotnet/sdk build 20221010.8 
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.100-rtm.22507.25 -> To Version 7.0.100-rtm.22510.8

Dependency coherency updates

Microsoft.Net.Compilers.Toolset
 From Version 4.4.0-3.22505.18 -> To Version 4.4.0-3.22507.1 (parent: Microsoft.NET.Sdk
 2022-10-10 18:13:26 +00:00
dotnet-bot
5fd8bdec08 Merge in 'release/7.0.1xx' changes 2022-10-10 16:31:39 +00:00
Michael Simons
dc021278a8
Remove questionable license cleanup logic (#14681) 2022-10-10 11:20:50 -05:00
Nikola Milosavljevic
837b3a1361 Remove redundant arguments - these properties are set by repos based on value of DisableSourceLink property 2022-10-10 15:39:33 +00:00
Nikola Milosavljevic
24a0212753 Condition sourcelink generation 2022-10-10 15:39:33 +00:00
dotnet-bot
e68e539c8c Merge in 'release/7.0.1xx' changes 2022-10-10 14:10:53 +00:00
dotnet-maestro[bot]
860067bade
[release/7.0.1xx] Update dependencies from dotnet/sdk (#14692) 
* Update dependencies from https://github.com/dotnet/sdk build 20221007.10

Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.100-rtm.22506.24 -> To Version 7.0.100-rtm.22507.10

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0-rtm.22507.2 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20221007.16

Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.100-rtm.22506.24 -> To Version 7.0.100-rtm.22507.16

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Build,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0-rtm.22507.2 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20221007.19

Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.100-rtm.22506.24 -> To Version 7.0.100-rtm.22507.19

* Update dependencies from https://github.com/dotnet/sdk build 20221007.25

Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.100-rtm.22507.19 -> To Version 7.0.100-rtm.22507.25

* Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Build,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0-rtm.22507.2 (parent: Microsoft.NET.Sdk

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
 2022-10-10 09:00:08 -05:00
dotnet-bot
b5bb0c2345 Merge in 'release/7.0.1xx' changes 2022-10-07 17:02:41 +00:00
Marc Paine
e216bf2d19
Merge pull request #14680 from dotnet/darc-release/7.0.1xx-c55536a9-ec3b-4427-804a-fb96e77732b4 
[release/7.0.1xx] Update dependencies from dotnet/sdk
 2022-10-07 09:51:34 -07:00
dotnet-bot
a3391ec4a4 Merge in 'release/7.0.1xx' changes 2022-10-07 13:19:03 +00:00
Michael Simons
7f9b0b787b
Merge branch 'release/7.0.1xx' into darc-release/7.0.1xx-c55536a9-ec3b-4427-804a-fb96e77732b4 2022-10-07 08:09:26 -05:00