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

4338 commits

Author SHA1 Message Date
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
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
Michael Simons
4e2d434f9a Workaround missing smoke-test prereqs 2021-10-21 19:38:00 +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
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
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
544f720d0c Edits per code review 2021-10-21 04:32:21 +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
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
Logan Bussell
a429914541
build Microsoft.CodeAnalysis.Features* in roslyn 2021-10-20 19:13:20 +00:00
Michael Simons
5f76b4d101 Update source-build prebuilts and previous source-built 2021-10-20 19:00:31 +00:00
dotnet-maestro[bot]
dca28b2c52
[release/6.0.1xx] Update dependencies from dotnet/sdk (#12451) 
[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.21518.16 to 6.0.0-rtm.21519.11 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rtm.21518.16 to 6.0.0-rtm.21519.11 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21518.20 to 6.0.0-rtm.21519.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21518.20 to 6.0.0-rtm.21519.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21518.20 to 6.0.0-rtm.21519.6 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21518.20 to 6.0.0-rtm.21519.6 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 6.0.0-rtm.21518.20 to 6.0.0-rtm.21519.6 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 6.0.0-rtm.21518.20 to 6.0.0-rtm.21519.6 (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.21518.9 to 6.0.0-rtm.21519.4 (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.21518.14 to 6.0.0-rtm.21519.8 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.FSharp.Compiler: from 12.0.0-beta.21518.8 to 12.0.0-beta.21519.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.SourceBuild.Intermediate.fsharp: from 6.0.1-beta.21518.8 to 6.0.1-beta.21519.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.ILLink.Tasks: from 6.0.100-1.21473.1 to 6.0.100-1.21519.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 4.0.0-6.21515.3 to 4.0.0-6.21519.19 (parent: Microsoft.NET.Sdk)
  - Microsoft.SourceBuild.Intermediate.source-build: from 0.1.0-alpha.1.21515.2 to 0.1.0-alpha.1.21519.2 (parent: Microsoft.NET.Sdk)

 - Revert removed feed

 - Merge branch 'release/6.0.1xx' of https://github.com/dotnet/installer into darc-release/6.0.1xx-c4f44800-5848-4386-a894-0ae69ed74d6b

 - Resolve source-build patches

 - Merge branch 'darc-release/6.0.1xx-c4f44800-5848-4386-a894-0ae69ed74d6b' of https://github.com/dotnet/installer into darc-release/6.0.1xx-c4f44800-5848-4386-a894-0ae69ed74d6b

 - Merge branch 'release/6.0.1xx' of https://github.com/dotnet/installer into darc-release/6.0.1xx-c4f44800-5848-4386-a894-0ae69ed74d6b

 - Resolve source-build patch conflicts
 2021-10-20 18:30:45 +00:00
Michael Simons
d0676ba094
Merge pull request #12462 from MichaelSimons/linker-prebuilts 
[ArPow] Eliminate linker prebuilts
 2021-10-20 12:10:07 -05:00
Dan Seefeldt
757ac5dd9f
Flow version of Microsoft.CodeAnalysis.Common in roslyn (#12461) 2021-10-20 17:04:25 +00:00
dotnet-maestro[bot]
83818e8038
[release/6.0.1xx] Update dependencies from dotnet/arcade (#12457) 
* Update dependencies from https://github.com/dotnet/arcade build 20211019.3

Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.21515.3 -> To Version 6.0.0-beta.21519.3

* Resolve source-build patch conflicts

* Restore the windowsdesktop feed

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
 2021-10-20 09:14:05 -07:00
Michael Simons
286b597ea3
Merge pull request #12397 from lbussell/roslyn-build-more-projects 
[ArPow] Add patches for building more roslyn projects
 2021-10-20 11:09:17 -05:00
Michael Simons
6e31861fea Eliminate linker prebuilts 2021-10-20 15:00:05 +00:00
Michael Simons
1f41ef82c9
Merge pull request #12458 from MichaelSimons/update-sb 
Update source-build prebuilts and previous source-build
 2021-10-20 07:40:11 -05:00
Michael Simons
a6871de837
Merge pull request #12455 from crummel/updateRoslynPatches 
Update to Roslyn version of patch.
 2021-10-19 22:14:19 -05:00
Michael Simons
27329680a2
Updates to patch comment 2021-10-19 20:08:10 -05:00
Michael Simons
d64125fa04 Update source-build prebuilts and previous source-build 2021-10-20 01:03:22 +00:00
Davis Goodin
2cf457ef38 Remove compiler project apphosts in source-build 2021-10-19 19:39:45 -05:00
Logan Bussell
fa57d106cc
don't build Microsoft.CodeAnalysis.Features* in source-build 2021-10-20 00:35:53 +00:00
Michael Simons
987ae36a54
Merge pull request #12351 from MichaelSimons/onboard-format 
Add format repo to source-build tarball
 2021-10-19 17:10:29 -05:00
Logan Bussell
83689bbca8
squash roslyn patches 2021-10-19 21:38:10 +00:00
Logan Bussell
15aa160465
add description to roslyn Microsoft.Build patch 2021-10-19 21:22:47 +00:00
Chris Rummel
6a1d84abb1
Update to Roslyn version of patch. 2021-10-19 14:57:10 -05:00
Logan Bussell
35104750bc
add patch for forcing roslyn Microsoft.Build to 16.5.0 2021-10-19 19:18:26 +00:00
Michael Simons
0951ed0c14
Merge pull request #12453 from eerhardt/RoslynAnalyzersPrebuilts 
Eliminate pre-built assets during source-build for roslyn-analyzers
 2021-10-19 14:15:18 -05:00
MichaelSimons
027603a892 Add format repo to source-build tarball 2021-10-19 19:01:55 +00:00
Dan Seefeldt
9c7822aad2
Add ArcadeSharedFrameworkSdkOverride (#12452) 2021-10-19 18:52:54 +00:00
Michael Simons
d9c398514c
Merge pull request #12449 from MichaelSimons/update-sb 
Update source-build prebuilts and previous source-built
 2021-10-19 12:29:04 -05:00
Eric Erhardt
53b74e7551 Eliminate pre-built assets during source-build for roslyn-analyzers 
This is taking the approach used in previous versions of source-build: update the dependency versions of Microsoft.CodeAnalysis to the version currently being built by source-build. This is a short-term solution to get unblocked in the 6.0.0 timeframe. In the future, the previous Microsoft.CodeAnalysis versions will be available in SBRP.

Contributes to https://github.com/dotnet/source-build/issues/2420
Contributes to https://github.com/dotnet/source-build/issues/2527
 2021-10-19 11:51:47 -05:00
Davis Goodin
c26605442b
dotnet/aspnetcore: Fix AppHost pack prebuilt usage in source-build (#12441) 2021-10-19 10:46:38 -05:00
Michael Simons
cf368887e0 Update source-build prebuilts and previous source-built 2021-10-19 12:50:56 +00:00
Michael Simons
afc7be470f
Merge pull request #12438 from MichaelSimons/arcade-nuget 
[ArPow] Resolve arcade nuget prebuilts
 2021-10-18 19:48:10 -05:00
Michael Simons
3808a1300d
Merge pull request #12435 from dagood/refpack-aspnetcore 
[release/6.0.1xx] dotnet/aspnetcore: Enable targeting pack build during source-build
 2021-10-18 18:12:27 -05:00
msimons@microsoft.com
98396fc664 Resolve arcade nuget prebuilts 2021-10-18 22:14:57 +00:00
Davis Goodin
82cfc6b0da dotnet/aspnetcore: Enable targeting pack build during source-build 2021-10-18 16:04:37 -05:00
Eric Erhardt
a1772c7f17 Add DotNetHost runtime patch. 
This should only be necessary until https://github.com/dotnet/runtime/pull/60577 is merged.
 2021-10-18 15:49:31 -05:00
Alex Perovich
784dbe3afa
Merge pull request #12374 from dotnet/addDotNetBuilds 
Add downloading of runtime assets from dotnetbuilds
 2021-10-18 10:14:11 -07:00
Michael Simons
013df0fc30 Update source-build prebuilts and previous source-built 2021-10-18 02:16:38 +00:00
Logan Bussell
407de8d99d
add patches for building more roslyn projects 2021-10-15 22:52:59 +00:00
Sarah Oslund
92ad65ff51 Update mac conclusion UI string 2021-10-15 14:32:46 -07:00
Davis Goodin
7a06aeebbf
[release/6.0.1xx] Remove msbuild prebuilts using patches (#12369) 2021-10-15 15:35:44 -05:00
Logan Bussell
470202635d
[ArPow] Resolve dotnet/linker Mono.Cecil prebuilt with patch (#12372) 
* add wip Mono.Cecil patches

* remove unnecessary linker patch

* add link to linker PR in patch
 2021-10-15 11:35:06 -07:00
Michael Simons
78f35bc23c
Merge pull request #12391 from MichaelSimons/restore-arcade-patch 
[ArPow] Restore arcade patch that was inadvertently removed
 2021-10-15 13:23:48 -05:00
Alex Perovich
003845e38f PR Feedback 2021-10-15 10:49:21 -07:00
Dan Seefeldt
726687d926
[ArPow] Update aspnetcore to use built versions of analyzers (#12375) 
* Update aspnetcore to use built versions of analyzers

* Move solution to repo project
 2021-10-15 17:40:58 +00:00
msimons@microsoft.com
c694b83d08 Revert "Resolve conflicts in source-build patches" 
This reverts commit e7cfd82155fd1f5054d89f8a03fd0b4b34d1f5e9.
 2021-10-15 15:44:14 +00:00
MichaelSimons
f5eac06079 Resolve Microsoft.Extensions.CommandLineUtils prebuilt 2021-10-15 13:43:18 +00:00
Doug Bunting
38669b06cb
Don't update implicit versions this month (#12379) 
- revert part of #12332
 2021-10-15 00:26:53 +00:00
Logan Bussell
0026f763ee
[ArPow] Resolve Microsoft.DotNet prebuilts for dotnet/roslyn (#12268) 
* remove two prebuilts

* add link to roslyn PR in patch
 2021-10-14 23:58:40 +00:00
sfoslund
8318bb6f08 Merge remote-tracking branch 'upstream/main' into HEAD 2021-10-14 13:42:46 -07:00
Michael Simons
6653586696
Merge pull request #12370 from MichaelSimons/update-previous-source-build 
Update source-build prebuilts and previous source-build
 2021-10-14 14:47:50 -05:00
dotnet-maestro[bot]
e3a96ef1c7
[release/6.0.1xx] Update dependencies from dotnet/arcade (#12349) 
[release/6.0.1xx] Update dependencies from dotnet/arcade
- Coherency Updates:
  - Microsoft.SourceLink.GitHub: from 1.1.0-beta-21423-02 to 1.1.0-beta-21480-02 (parent: Microsoft.DotNet.Arcade.Sdk)

 - Resolve conflicts in source-build patches

 - Resolve conflicts in source-build patches
 2021-10-14 19:33:05 +00:00
Alex Perovich
1e9a661bbb Add downloading of runtime assets from dotnetbuilds 2021-10-14 12:13:40 -07:00
Doug Bunting
973613e911
[main] Update Asp.Net templates (#12332) 
* [main] Update Asp.Net templates
* Update GenerateBundledVersions.targets too
 2021-10-14 10:41:38 -07:00
Doug Bunting
6ff730a152
[release/6.0.1xx] Update Asp.Net templates (#12331) 
* [release/6.0.1xx] Update Asp.Net templates
* Update GenerateBundledVersions.targets too
 2021-10-14 10:41:17 -07:00
Michael Simons
f929db75b3 Update source-build prebuilts and previous source-build 2021-10-14 16:16:09 +00:00
dotnet-maestro[bot]
8b7247c58e
[release/6.0.1xx] Update dependencies from dotnet/sdk (#12355) 
[release/6.0.1xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21512.8 to 6.0.0-rtm.21513.8 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.0-rtm.21512.8 to 6.0.0-rtm.21513.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21512.8 to 6.0.0-rtm.21513.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-rtm.21512.8 to 6.0.0-rtm.21513.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-rtm.21512.8 to 6.0.0-rtm.21513.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 6.0.0-rtm.21512.8 to 6.0.0-rtm.21513.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21512.5 to 6.0.0-rtm.21513.9 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21512.5 to 6.0.0-rtm.21513.9 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21512.5 to 6.0.0-rtm.21513.9 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21512.5 to 6.0.0-rtm.21513.9 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 6.0.0-rtm.21512.5 to 6.0.0-rtm.21513.9 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 6.0.0-rtm.21512.5 to 6.0.0-rtm.21513.9 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21512.8 to 6.0.0-rtm.21513.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.Workload.Emscripten.Manifest-6.0.100: from 6.0.0-rtm.21505.3 to 6.0.0-rtm.21512.1 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0)

 - Resolve source-build patch conflicts
 2021-10-14 02:41:17 +00:00
Jon Fortescue
a10dba8712
Merge pull request #12236 from jonfortescue/1esPoolsMain 
Switch to 1ES R&D pools on main
 2021-10-13 14:26:32 -07:00
Davis Goodin
032f3aab69
[release/6.0.1xx] Add short source-build dev README (#12292) 
* Add short source-build dev README

* Describe patch creation process
 2021-10-13 12:46:46 -05:00
sfoslund
0ceb3dcfa0 [release/6.0.1xx] Fix bad merge 2021-10-13 09:24:40 -07:00
sfoslund
b5fc6e1f03 [main] Fix bad merge 2021-10-13 09:23:47 -07:00
Eric Erhardt
fa1573136d
Add runtime patches to eliminate pre-builts (#12318) 
* Add runtime patches to eliminate pre-builts
 2021-10-13 11:15:45 -05:00
Chris Rummel
e15beac0f6
Move Omnisharp fix to the correct place. (#12297) 
* Move Omnisharp fix to the correct place.
We had some crossed PRs and this got added while the other patches were being moved.  This moves it to the correct place.

* Update patch to apply to new hash.

* Another project dependency.
 2021-10-13 11:15:20 -05:00
dotnet-maestro[bot]
b10c4f72cd
[release/6.0.1xx] Update dependencies from dotnet/sdk (#12336) 
[release/6.0.1xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-rtm.21512.3 to 6.0.0-rtm.21512.5 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rtm.21512.3 to 6.0.0-rtm.21512.5 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rtm.21512.3 to 6.0.0-rtm.21512.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21512.3 to 6.0.0-rtm.21512.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-rtm.21512.3 to 6.0.0-rtm.21512.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21512.3 to 6.0.0-rtm.21512.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-rtm.21512.2 to 6.0.0-rtm.21512.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

 - Resolve source-build patch conflicts
 2021-10-13 16:13:40 +00:00
Michael Simons
76b74717b7
Merge pull request #12319 from MichaelSimons/update-previous-SB2 
Update prebuilts and previous source-build
 2021-10-13 08:05:17 -05:00
MichaelSimons
3d2c179c2c Update prebuilts and previous source-build 2021-10-12 20:45:37 +00:00
MichaelSimons
c0f3461780 Enable all smoke-tests 2021-10-12 20:19:36 +00:00
Sarah Oslund
654e77182d
Merge pull request #12302 from sfoslund/UpdateManifestAuth 
Update baseline manifest authoring for localization dir
 2021-10-12 11:25:36 -07:00
Michael Simons
3a434f6fd7
Merge pull request #12271 from MichaelSimons/issue-2489 
Handle workload manifests as text-only packages in source-build
 2021-10-12 09:02:01 -05:00
Jason Zhai
1fb1cf6af5 Merge branch 'release/6.0.1xx' into main 2021-10-11 23:30:57 -07:00
MichaelSimons
ee7b08fdb6 Edit per code review 2021-10-12 02:23:02 +00:00
Sarah Oslund
ba5131fbf5 Update manifest authoring for localization dir 2021-10-11 16:13:35 -07:00
Dan Seefeldt
5cda6a56f9
Fix publish targets in vstest to eliminate prebuilts (#12294) 2021-10-11 17:36:10 -05:00
Davis Goodin
b7df57c2b4
[6.0.1xx] dotnet/arcade: Disable Workloads WiX dependency in source-build to remove prebuilt (#12290) 2021-10-11 15:08:32 -05:00
Michael Simons
b65fee00a5
Merge pull request #12287 from MichaelSimons/patch-cleanup 
Remove source-build obsolete bootstrapping patches
 2021-10-11 15:01:45 -05:00