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

22217 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Simons
8cd48143b2
Merge pull request #12488 from MichaelSimons/update-sb 
Update source-build prebuilts and previous source-build
 2021-10-22 08:23:59 -05:00
dotnet-maestro[bot]
2b005f3491
Update dependencies from https://github.com/dotnet/sdk build 20211021.16 (#12490) 
[release/6.0.1xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.AspNetCore.App.Ref: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21521.9 to 6.0.0-rtm.21521.10 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21521.9 to 6.0.0-rtm.21521.10 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 6.0.0-rtm.21521.9 to 6.0.0-rtm.21521.10 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 6.0.0-rtm.21521.9 to 6.0.0-rtm.21521.10 (parent: Microsoft.NET.Sdk)
 2021-10-22 08:05:35 +00:00
Chris Rummel
c29087f7a2
These also apply for net6.0. 2021-10-22 02:11:37 -05:00
dotnet-maestro[bot]
1e7dbb727a
Update dependencies from https://github.com/dotnet/sdk build 20211021.15 (#12489) 
[release/6.0.1xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rtm.21520.17 to 6.0.0-rtm.21521.5 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rtm.21520.17 to 6.0.0-rtm.21521.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21521.5 to 6.0.0-rtm.21521.9 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21521.5 to 6.0.0-rtm.21521.9 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 6.0.0-rtm.21521.5 to 6.0.0-rtm.21521.9 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 6.0.0-rtm.21521.5 to 6.0.0-rtm.21521.9 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-rtm.21520.13 to 6.0.0-rtm.21521.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-rtm.21520.13 to 6.0.0-rtm.21521.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
 2021-10-22 06:10:31 +00:00
dotnet-maestro[bot]
7ae99ce59f
[release/6.0.1xx] Update dependencies from dotnet/sdk (#12482) 
[release/6.0.1xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.NETCore.App.Ref: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.0-rtm.21520.9 to 6.0.0-rtm.21521.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21521.1 to 6.0.0-rtm.21521.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21521.1 to 6.0.0-rtm.21521.5 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 6.0.0-rtm.21521.1 to 6.0.0-rtm.21521.5 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 6.0.0-rtm.21521.1 to 6.0.0-rtm.21521.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.FSharp.Compiler: from 12.0.0-beta.21519.2 to 12.0.0-beta.21521.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.SourceBuild.Intermediate.fsharp: from 6.0.1-beta.21519.2 to 6.0.1-beta.21521.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.Build: from 17.0.0-preview-21515-03 to 17.0.0 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21520.9 to 6.0.0-rtm.21521.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.Workload.Emscripten.Manifest-6.0.100: from 6.0.0 to 6.0.0 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0)

 - edit sourcebuild metadata for stable versioning

 - Merge branch 'release/6.0.1xx' into darc-release/6.0.1xx-90ae2a78-bcca-4d8e-aedf-7eaa99dfc9bf
 2021-10-22 05:34:48 +00:00
Chris Rummel
77b70c9c64
Actually only do this for netstandard. 2021-10-21 21:59:17 -05:00
Chris Rummel
de12f87965
Patch resolution 2021-10-21 21:59:17 -05:00
Chris Rummel
dde04b27b1
Have to fix some conditionals for multiple netstandards. 2021-10-21 21:59:17 -05:00
Chris Rummel
cb5ef3f9e2
NuGet also depends on XDT - add netstandard2.0 there. 2021-10-21 21:59:17 -05:00
Chris Rummel
2823ea21fb
Introduce temporary dependency from templating on NuGet to ensure it picks up the new fixed packages. 2021-10-21 21:59:17 -05:00
Chris Rummel
aab9a8b3a6
A few projects didn't use the project-wide variables for determining TFMs. 2021-10-21 21:59:17 -05:00
Chris Rummel
34ee4c4fff
Delete templating patch and just use netstandard2.0 in NuGet. 2021-10-21 21:59:17 -05:00
Chris Rummel
cfa552637d
wip: just enable themissing NuGet and MSBuild TFMs 2021-10-21 21:59:17 -05:00
Michael Simons
ffcb72fbdc Update source-build prebuilts and previous source-build 2021-10-22 02:56:26 +00:00
dotnet-maestro[bot]
a2c7b5b277
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211021.1 (#12484) 
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
 2021-10-21 23:47:27 +00:00
Logan Bussell
2903842db2
add ExtraPackageVersionPropsPackageInfo to force roslyn prebuilts to previously source built versions 2021-10-21 23:33:08 +00:00
Logan Bussell
374f8b5faa
add patch for lifting versions of roslyn prebuilts 2021-10-21 23:24:30 +00:00
Michael Simons
ef208026a2
Merge pull request #12481 from MichaelSimons/smoke-test-fixes 
Workaround missing smoke-test prereqs
 2021-10-21 17:24:56 -05:00
Michael Simons
c6594de659
Merge pull request #12465 from lbussell/build-roslyn-ca-features 
[ArPow] Re-enable building Microsoft.CodeAnalysis.Features* in roslyn source-build
 2021-10-21 15:41:26 -05:00
Michael Simons
dd90b93727
Merge pull request #12456 from dagood/rm-compilers-apphost-prebuilt 
[release/6.0.1xx] Remove compiler project apphosts in source-build to remove apphost pack prebuilt
 2021-10-21 15:39:27 -05:00
Matt Mitchell
2736213c68
Revert "Revert "[release/6.0.1xx] Switch to stable RTM branding"" (#12471) 
* Revert "Revert "[release/6.0.1xx] Switch to stable RTM branding" (#12470)"

This reverts commit 2bca7f450a.

* Workaround F# failures in tests

* No need for feed
 2021-10-21 13:26:34 -07:00
Michael Simons
4e2d434f9a Workaround missing smoke-test prereqs 2021-10-21 19:38:00 +00:00
dotnet-maestro[bot]
228b577bf4
Update dependencies from https://github.com/dotnet/sdk build 20211021.8 (#12480) 
[release/6.0.1xx] Update dependencies from dotnet/sdk
 2021-10-21 18:57:08 +00:00
Michael Simons
8dc521acfa
Merge pull request #12477 from MichaelSimons/update-sb 
Update source-build prebuilts and previous source-build
 2021-10-21 13:53:35 -05:00
Michael Simons
9326af2814
Merge pull request #12472 from dseefeld/fixMsBuild 
[ArPow] Build msbuild for net472 and remove dependency on VS component
 2021-10-21 13:29:55 -05:00
Michael Simons
1d2eee3e93
Merge pull request #12478 from mmitche/tweak-source-build-version 
[release/6.0.1xx] Repoint source-build dependencies for runtime and aspnet
 2021-10-21 13:00:58 -05:00
Davis Goodin
4674b50a34 Polish patch files: squash and add links 2021-10-21 12:49:15 -05:00
MichaelSimons
b0217294ed aspnetcore stable version workaround 2021-10-21 17:19:38 +00:00
Matt Mitchell
00a9212068 touch sb dir 2021-10-21 08:08:10 -07:00
Matt Mitchell
d87673683c Repoint source-build dependencies for runtime and aspnet 2021-10-21 08:06:10 -07:00
dotnet-maestro[bot]
f0fe351603
[release/6.0.1xx] Update dependencies from dotnet/sdk (#12473) 
* Update dependencies from https://github.com/dotnet/sdk build 20211020.26

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.100-rtm.21520.1 -> To Version 6.0.100-rtm.21520.26

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,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.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100
 From Version 6.0.0 -> To Version 6.0.0 (parent: Microsoft.NET.Sdk

* Resolve source-build patch conflicts

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.100-rtm.21520.1 -> To Version 6.0.100-rtm.21520.31

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,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.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100
 From Version 6.0.0 -> To Version 6.0.0 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.100-rtm.21520.1 -> To Version 6.0.100-rtm.21521.1

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.100-rtm.21521.1 -> To Version 6.0.100-rtm.21521.2

* Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,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.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100
 From Version 6.0.0 -> To Version 6.0.0 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.100-rtm.21520.1 -> To Version 6.0.100-rtm.21521.3

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,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.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100
 From Version 6.0.0 -> To Version 6.0.0 (parent: Microsoft.NET.Sdk

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
 2021-10-21 06:22:35 -07:00
Michael Simons
08fc0161cb Update source-build prebuilts and previous source-build 2021-10-21 12:32:30 +00:00
Michael Simons
023e0d7186 Update to not include CA.Collection package in source-build 2021-10-21 12:26:21 +00:00
Michael Simons
5bf7c8e147
Merge pull request #12466 from MichaelSimons/update-sb 
Update source-build prebuilts and previous source-built
 2021-10-21 04:43:30 -05:00
Michael Simons
d38d8049ef
Merge pull request #12469 from dagood/prebuilt-apphost-aspnetcore 
Fix patch removing aspnetcore apphost pack prebuilt
 2021-10-21 04:33:04 -05:00
Michael Simons
f958686c51
Merge pull request #12475 from dotnet/darc-release/6.0.1xx-2e97760a-a081-4c03-88ad-f2a59ca3c0ef 
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
 2021-10-21 02:22:19 -05:00
dotnet-maestro[bot]
f165d9f83a Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211020.5 
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-alpha.1.21520.4 -> To Version 6.0.0-alpha.1.21520.5
 2021-10-21 06:48:43 +00:00
Michael Simons
544f720d0c Edits per code review 2021-10-21 04:32:21 +00:00
Michael Simons
b897fdf33d
Merge pull request #12474 from dotnet/darc-release/6.0.1xx-1be052a5-04e7-4567-99c2-aef9aa164b55 
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
 2021-10-20 23:02:15 -05:00
dotnet-maestro[bot]
95a170d57b Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211020.4 
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-alpha.1.21520.3 -> To Version 6.0.0-alpha.1.21520.4
 2021-10-21 03:20:26 +00:00
Michael Simons
16d51bd2aa Patch edits 2021-10-21 03:14:32 +00:00
Michael Simons
57ab17c67a Merge branch 'release/6.0.1xx' of https://github.com/dotnet/installer into build-roslyn-ca-features 2021-10-21 00:56:31 +00:00
Michael Simons
375383b5fa Refactor patches to build additional projects 2021-10-21 00:55:46 +00:00
Davis Goodin
388ed26a0c Fix patch removing aspnetcore apphost pack prebuilt 2021-10-20 19:53:47 -05:00
Michael Simons
931367000f
Merge pull request #12468 from MichaelSimons/sb-format-references 
[ArPow] Add roslyn-analyzers as format dependency
 2021-10-20 19:19:43 -05:00
Michael Simons
63429f4050
Merge pull request #12463 from dotnet/darc-release/6.0.1xx-e3b95aaf-a8af-4ffe-aab0-6a120cfe0928 
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
 2021-10-20 17:34:43 -05:00
Matt Mitchell
2bca7f450a
Revert "[release/6.0.1xx] Switch to stable RTM branding" (#12470) 2021-10-20 15:00:49 -07:00
dseefeld
d2e491a787 Build msbuild for net472 and remove depdency on VS 2021-10-20 21:59:04 +00:00
Michael Simons
b14e9a8e77 Add roslyn-analyzer as format dependency 2021-10-20 21:03:14 +00:00
Dan Seefeldt
25b214363d
Merge branch 'release/6.0.1xx' into darc-release/6.0.1xx-e3b95aaf-a8af-4ffe-aab0-6a120cfe0928 2021-10-20 15:03:41 -05:00