Commit graph

4815 commits

Author SHA1 Message Date
Přemek Vysoký
7b01465aaa
Update DarcLib to handle source-build patches in VMR init (#14413) 2022-08-29 11:54:20 +00:00
dotnet-maestro-bot
91953ec1c0
[automated] Merge branch 'release/7.0.1xx' => 'main' (#14394)
* Update dependencies from https://github.com/dotnet/arcade build 20220812.2 (#14326)

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

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

* Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220819.1

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22413.1 -> To Version 6.0.0-servicing.22419.1

* Update dependencies from https://github.com/dotnet/arcade build 20220818.4 (#14354)

[release/7.0.1xx] Update dependencies from dotnet/arcade
- Coherency Updates:
  - Microsoft.SourceLink.GitHub: from 1.2.0-beta-22410-01 to 1.2.0-beta-22416-01 (parent: Microsoft.DotNet.Arcade.Sdk)
  - Microsoft.DotNet.XliffTasks: from 1.0.0-beta.22409.1 to 1.0.0-beta.22415.3 (parent: Microsoft.DotNet.Arcade.Sdk)

* Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220819.2

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22419.1 -> To Version 6.0.0-servicing.22419.2

* Enable BlazorWasm source-build test (#14346)

* Add llvm-project to source-build. (#14184) (#14314)

* Add llvm-project to source-build.

* Add repo references to llvm-project.

* Add source-build metadata.

* Upgrade CI to CentOS Stream 8.

* Fix the image name in the right place.

* Patch llvm to use an MS.Build.Traversal that we have.

* Add backport PR to patch.

* Revert "Upgrade CI to CentOS Stream 8."

This reverts commit 6bc2754d5e3eecddc1788555c196f272567312bf.

* Update to avoid new MSBuild warning that causes build failure.

* We use code out of the LLVM directory.  Copy the license file from there to the root to satisfy the license checker.

* Add SourceBuild.props to llvm.

* Update patches with backport PR pointers.

* Update poison baseline. (#14345)

* Update poison baseline.

* Fix RIDs by replacing with placeholders.

* Exclude a few more non-binary file types from poison checking.

* Ignore empty files when checking for poison.

* Update baseline with new exclusions.

* Poison report can have both portable and non-portable RIDs in it, remove both.

* Update dependencies from https://github.com/dotnet/sdk build 20220823.8 (#14371)

Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.100-rc.2.22416.39 -> To Version 7.0.100-rc.2.22423.8

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,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,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.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,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.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.Manifest-7.0.100
 From Version 7.0.0-rc.1.22379.3 -> To Version 7.0.0-rc.2.22422.9 (parent: Microsoft.NET.Sdk

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

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

Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.100-rc.2.22423.13 -> To Version 7.0.100-rc.2.22423.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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates
 From Version 7.0.0-rc.2.22422.9 -> To Version 7.0.0-rc.2.22423.4 (parent: Microsoft.NET.Sdk

* Dependency coherency updates (#14365)

runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter
 From Version 1.0.0-alpha.1.22364.1 -> To Version 1.0.0-alpha.1.22364.1 (parent: Microsoft.NETCore.App.Runtime.win-x64

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

* Dependency coherency updates

runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter
 From Version 1.0.0-alpha.1.22411.1 -> To Version 1.0.0-alpha.1.22411.1 (parent: Microsoft.NETCore.App.Runtime.win-x64

* Update source-build build images (#14321)

* Fix aspnetcore offline build when nodejs is installed

* Remove centos7 and 8, replace with stream 8

* Change Fedora 33 container to Fedora 36

* Revert "Change Fedora 33 container to Fedora 36"

* Remove unused debian container definition

* Add extra packages needed for bootstrapping arm64

* Use PackageDownloads for bootstrapping PSB artifacts and update prebuilts version

Co-authored-by: Chris Rummel <crummel@microsoft.com>

* Prevent System.Memory package downgrade in razor-compiler (#14384) (#14391)

* Revert "Add razor-compiler patch to fix bootstrap build (#14379)"

This reverts commit 1ebb3eb8b8b9364196f4db421ad27d30ff00d11d.

* Add razor-compiler patch to prevent System.Memory downgrades

* Add roslyn patch to lift System.Memory version

* Use -svc pool provider in release branches

* [release/7.0.1xx] Update dependencies from dotnet/sdk (#14381)

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

Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.100-rc.2.22423.25 -> To Version 7.0.100-rc.2.22423.30

Dependency coherency updates

runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.NET.ILLink.Tasks
 From Version 1.0.0-alpha.1.22411.1 -> To Version 1.0.0-alpha.1.22411.1 (parent: Microsoft.NETCore.App.Runtime.win-x64

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

Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.100-rc.2.22423.25 -> To Version 7.0.100-rc.2.22423.32

Dependency coherency updates

runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.NET.ILLink.Tasks
 From Version 1.0.0-alpha.1.22411.1 -> To Version 1.0.0-alpha.1.22411.1 (parent: Microsoft.NETCore.App.Runtime.win-x64

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

Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.100-rc.2.22423.25 -> To Version 7.0.100-rc.2.22424.4

Dependency coherency updates

runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset
 From Version 1.0.0-alpha.1.22411.1 -> To Version 1.0.0-alpha.1.22411.1 (parent: Microsoft.NETCore.App.Runtime.win-x64

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

Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.100-rc.2.22423.25 -> To Version 7.0.100-rc.2.22424.9

Dependency coherency updates

runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset
 From Version 1.0.0-alpha.1.22411.1 -> To Version 1.0.0-alpha.1.22411.1 (parent: Microsoft.NETCore.App.Runtime.win-x64

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

Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.100-rc.2.22423.25 -> To Version 7.0.100-rc.2.22424.14

Dependency coherency updates

runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset
 From Version 1.0.0-alpha.1.22411.1 -> To Version 1.0.0-alpha.1.22411.1 (parent: Microsoft.NETCore.App.Runtime.win-x64

* Resolve llvm source-build patch conflict

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: MichaelSimons <msimons@microsoft.com>

* Remove XDT dependency and patch (#14395)

* [release/7.0.1xx] Update dependencies from dotnet/sdk (#14396)

[release/7.0.1xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 7.0.0-rc.2.22423.4 to 7.0.0-rc.2.22424.8 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0: from 7.0.0-rc.2.22423.4 to 7.0.0-rc.2.22424.8 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0: from 7.0.0-rc.2.22423.4 to 7.0.0-rc.2.22424.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 7.0.0-rc.2.22423.16 to 7.0.0-rc.2.22424.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-rc.2.22423.16 to 7.0.0-rc.2.22424.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-rc.2.22423.16 to 7.0.0-rc.2.22424.4 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-rc.2.22423.16 to 7.0.0-rc.2.22424.4 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 7.0.0-rc.2.22423.16 to 7.0.0-rc.2.22424.4 (parent: Microsoft.NET.Sdk)
  - dotnet-user-jwts: from 7.0.0-rc.2.22423.16 to 7.0.0-rc.2.22424.4 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 7.0.0-rc.2.22423.16 to 7.0.0-rc.2.22424.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-rc.2.22423.4 to 7.0.0-rc.2.22424.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 7.0.0-rc.2.22423.3 to 7.0.0-rc.2.22424.12 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-rc.2.22423.4 to 7.0.0-rc.2.22424.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 7.0.0-rc.2.22423.2 to 7.0.0-rc.2.22424.8 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.Net.Compilers.Toolset: from 4.4.0-2.22423.18 to 4.4.0-2.22424.9 (parent: Microsoft.NET.Sdk)

* Update dependencies from https://github.com/dotnet/source-build-externals build 20220824.1 (#14401)

[release/7.0.1xx] Update dependencies from dotnet/source-build-externals

* Update Versions.Details.xml source-build metadata (#14375)

* Update dependencies from https://github.com/dotnet/test-templates build 20220825.1 (#14400)

Microsoft.DotNet.Test.ProjectTemplates.5.0 , Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0
 From Version 1.0.2-beta4.22409.1 -> To Version 1.0.2-beta4.22425.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

* Update source-build-externals (#14405)

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: Marc Paine <marcpop@microsoft.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
Co-authored-by: Chris Rummel <crummel@microsoft.com>
Co-authored-by: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
Co-authored-by: Logan Bussell <loganbussell@microsoft.com>
Co-authored-by: Matt Galbraith <mattgal@microsoft.com>
Co-authored-by: Nikola Milosavljevic <nikolam@microsoft.com>
Co-authored-by: Matt Galbraith <MattGal@users.noreply.github.com>
2022-08-26 08:18:11 -05:00
Přemek Vysoký
e6c9208965
Handle source-build patches in VMR initialization (#14397)
- Bumps to a new version of DarcLib that handles SB patches
- Configures the VMR to point to tarball patches
- Adds a missing `llvm-project` mapping
2022-08-25 20:57:31 +02:00
dotnet-maestro[bot]
86925059c6
[main] Update dependencies from dotnet/arcade (#14385)
* Update dependencies from https://github.com/dotnet/arcade build 20220823.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.22419.1 -> To Version 7.0.0-beta.22423.2

Dependency coherency updates

runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks
 From Version 1.0.0-alpha.1.22364.1 -> To Version 1.0.0-alpha.1.22364.1 (parent: Microsoft.NETCore.App.Runtime.win-x64

* Resolve llvm source-build patch conflict

* Update dependencies from https://github.com/dotnet/arcade build 20220824.3

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.22419.1 -> To Version 7.0.0-beta.22424.3

Dependency coherency updates

runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks
 From Version 1.0.0-alpha.1.22364.1 -> To Version 1.0.0-alpha.1.22364.1 (parent: Microsoft.NETCore.App.Runtime.win-x64

* Update global.json patch for llvm.

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: MichaelSimons <msimons@microsoft.com>
Co-authored-by: Chris Rummel <crummel@microsoft.com>
2022-08-25 11:01:42 -07:00
Přemek Vysoký
b9635390c8
Add a VMR initialization (bootstrap) process (#14343)
Adds the possibility to initialize a fresh VMR off of the current `dotnet/installer` commit.
Similarly to the tarball generation, the process can be triggered by running:
```
./build.sh /p:InitializeVMR=true /p:VmrDir=[Path were VMR will be created]
```
2022-08-23 21:06:59 +02:00
Michael Simons
0fbacc7333
Disable dotnet format test (#14366) 2022-08-22 22:33:54 -05:00
dotnet-maestro-bot
e0d94df3df
[automated] Merge branch 'release/7.0.1xx' => 'main' (#14359)
* Update dependencies from https://github.com/dotnet/arcade build 20220818.4 (#14354)

[release/7.0.1xx] Update dependencies from dotnet/arcade
- Coherency Updates:
  - Microsoft.SourceLink.GitHub: from 1.2.0-beta-22410-01 to 1.2.0-beta-22416-01 (parent: Microsoft.DotNet.Arcade.Sdk)
  - Microsoft.DotNet.XliffTasks: from 1.0.0-beta.22409.1 to 1.0.0-beta.22415.3 (parent: Microsoft.DotNet.Arcade.Sdk)

* Enable BlazorWasm source-build test (#14346)

* Add llvm-project to source-build. (#14184) (#14314)

* Add llvm-project to source-build.

* Add repo references to llvm-project.

* Add source-build metadata.

* Upgrade CI to CentOS Stream 8.

* Fix the image name in the right place.

* Patch llvm to use an MS.Build.Traversal that we have.

* Add backport PR to patch.

* Revert "Upgrade CI to CentOS Stream 8."

This reverts commit 6bc2754d5e3eecddc1788555c196f272567312bf.

* Update to avoid new MSBuild warning that causes build failure.

* We use code out of the LLVM directory.  Copy the license file from there to the root to satisfy the license checker.

* Add SourceBuild.props to llvm.

* Update patches with backport PR pointers.

Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
Co-authored-by: Chris Rummel <crummel@microsoft.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
2022-08-22 08:48:32 -05:00
Marc Paine
26721a6e45
Fix typo 2022-08-17 16:49:54 -07:00
Marc Paine
00df283666
Pin to the 7.0 templates for now until 8.0 ones exist 2022-08-17 12:48:18 -07:00
MichaelSimons
6d737887ec Remove backported source-build patches 2022-08-15 13:49:27 +00:00
Michael Simons
fd587269d0
Source-build runtime patch to support newer compiler (#14319)
* Source-build runtime patch to support newer compiler

* Add linker source-build patch

* Fix linker patch

* Revert Roslyn change that added restrictions on managed types.

* Add related issues to patch.

* Switch to the official linker patch for the InvalidOperationException.

* Add linker patch to remove prebuilts

Co-authored-by: Chris Rummel <crummel@microsoft.com>
2022-08-13 08:42:39 +00:00
Logan Bussell
1e9df8721a
Fix aspnetcore source build error due to razor compiler typo (#14315)
* Add razor compiler patch for #319

* Add comment to PR
2022-08-12 12:53:00 -05:00
dotnet-maestro[bot]
fa0647c82a
[main] Update dependencies from dotnet/sdk (#14281)
* Update dependencies from https://github.com/dotnet/sdk build 20220809.4

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-rc.1.22404.18 -> To Version 7.0.100-rc.1.22409.4

Dependency coherency updates

Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.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.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-rc.1.22403.8 -> To Version 7.0.0-rc.1.22408.8 (parent: Microsoft.NET.Sdk

* Remove two backported source-build patches

* source-build changes to support templating combining w/sdk

* Additional sdk templating patches

* Fix patch conflict

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

Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-rc.1.22409.4 -> To Version 7.0.100-dev

Dependency coherency updates

Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.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.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-rc.1.22403.8 -> To Version 7.0.0-rc.1.22408.8 (parent: Microsoft.NET.Sdk

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

Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.100-rc.1.22409.4 -> To Version 7.0.100-rc.1.22411.4

Dependency coherency updates

Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.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.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-rc.1.22403.8 -> To Version 7.0.0-rc.1.22410.1 (parent: Microsoft.NET.Sdk

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

Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.100-rc.1.22409.4 -> To Version 7.0.100-rc.1.22411.3

Dependency coherency updates

Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.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.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-rc.1.22403.8 -> To Version 7.0.0-rc.1.22410.1 (parent: Microsoft.NET.Sdk

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

Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.100-rc.1.22409.4 -> To Version 7.0.100-rc.1.22411.5

Dependency coherency updates

Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.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.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-rc.1.22403.8 -> To Version 7.0.0-rc.1.22410.1 (parent: Microsoft.NET.Sdk

* Remove backported source-build sdk patches

* Revert "source-build changes to support templating combining w/sdk"

This reverts commit 7223d6eb777cbeb771812ff5a4d9cf4289aa4833.

* Update source-build dependencies

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

Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.100-rc.1.22409.4 -> To Version 7.0.100-rc.1.22411.7

Dependency coherency updates

Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.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.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-rc.1.22403.8 -> To Version 7.0.0-rc.1.22410.1 (parent: Microsoft.NET.Sdk

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

Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.100-rc.1.22409.4 -> To Version 7.0.100-rc.1.22411.9

Dependency coherency updates

Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.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.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-rc.1.22403.8 -> To Version 7.0.0-rc.1.22410.1 (parent: Microsoft.NET.Sdk

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

Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.100-rc.1.22409.4 -> To Version 7.0.100-rc.1.22411.10

Dependency coherency updates

Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.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.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-rc.1.22403.8 -> To Version 7.0.0-rc.1.22410.9 (parent: Microsoft.NET.Sdk

* Pull in latest sdk locally via darc

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: MichaelSimons <msimons@microsoft.com>
2022-08-11 22:05:59 -05:00
Michael Simons
df7bb618ce
Update source-build artifacts and toolset (#14306) 2022-08-11 20:01:18 -05:00
Marc Paine
b3e1a28fb3
Merge pull request #14297 from dotnet-maestro-bot/merge/release/6.0.4xx-to-main
[automated] Merge branch 'release/6.0.4xx' => 'main'
2022-08-10 10:18:46 -07:00
Marc Paine
dd19808458
Merge pull request #14267 from dotnet/marcpopMSFT-fixknownapphostmain
Stop downloading app hosts for android
2022-08-10 10:18:11 -07:00
Marc Paine
90bb556af4
Removing code that was removed from main 2022-08-09 16:02:29 -07:00
Marc Paine
eeb9ec1382
Merge branch 'main' into merge/release/6.0.4xx-to-main 2022-08-09 14:04:34 -07:00
Marc Paine
eaaf3b3160
Merge pull request #14276 from dotnet/marcpopMSFT-addbuildtoversion
Add the full nuget version into the .version file
2022-08-09 14:02:46 -07:00
Doug Bunting
4834b574a7
[main] Update template versions from dotnet/aspnetcore (#14246) 2022-08-09 19:48:35 +00:00
Marc Paine
b33d35cbe4
Merge pull request #14266 from dotnet/marcpopMSFT-fixapphostdownload
Stop app host downloads for android
2022-08-09 11:48:32 -07:00
Michael Simons
c85583bd81
Update source-build toolset and artifacts (#14242) 2022-08-08 18:46:33 -05:00
Marc Paine
063d79ea3e
Merge pull request #14270 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-08-08 15:51:27 -07:00
Marc Paine
c2621e823d
Merge pull request #14275 from dotnet/marcpopMSFT-includereleasesintemplatelocator
Add the releases binary to the template locator transport package
2022-08-08 15:51:11 -07:00
Marc Paine
e2a0da3d8f Add the full nuget version into the .version file 2022-08-08 14:21:30 -07:00
Marc Paine
b7ea03ca79 Add releases to the list of files to copy to the templatelocator output 2022-08-08 13:50:10 -07:00
Michael Simons
85c5e8b46e
Add razor-compiler and runtime patches to unblock prebuilt elimination (#14269) 2022-08-08 08:41:00 -05:00
Marc Paine
372935eab6
Merge pull request #14268 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-08-05 15:48:17 -07:00
Michael Simons
785bddf6a5
Add current source-build prebuilts to support offline builds (#14261) 2022-08-05 16:43:02 -05:00
Marc Paine
7d9c97ef9a Add the releases dll to the template locator path and authoring. 2022-08-05 13:53:00 -07:00
Michael Simons
0595aeb403
Exclude intermediate and rid specific packages from artifacts tarball (#14224) 2022-08-05 15:40:11 -05:00
Michael Simons
7f8373be12
Update logic to delete files with questionable licenses (#14264) 2022-08-05 14:29:34 -05:00
Michael Simons
e759aafdd0
Update delete files with questionable licenses logic (#14265) 2022-08-05 14:26:50 -05:00
Marc Paine
9c8ffb2f43
Stop downloading app hosts for android 2022-08-05 12:05:26 -07:00
Marc Paine
005dd2364d
Stop app host downloads for android 2022-08-05 12:04:17 -07:00
dotnet-maestro[bot]
9adf3a6cb9
[main] Update dependencies from dotnet/sdk (#14258)
* Update dependencies from https://github.com/dotnet/sdk build 20220803.12

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-rc.1.22403.11 -> To Version 7.0.100-rc.1.22403.12

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp
 From Version 12.0.6-beta.22381.3 -> To Version 12.0.6-beta.22402.2 (parent: Microsoft.NET.Sdk

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

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-rc.1.22403.11 -> To Version 7.0.100-rc.1.22403.14

Dependency coherency updates

Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp
 From Version 7.0.0-rc.1.22403.3 -> To Version 7.0.0-rc.1.22403.6 (parent: Microsoft.NET.Sdk

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

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-rc.1.22403.11 -> To Version 7.0.100-rc.1.22403.15

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

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-rc.1.22403.15 -> To Version 7.0.100-rc.1.22403.21

* Dependency coherency updates

Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset
 From Version 7.0.0-rc.1.22403.3 -> To Version 7.0.0-rc.1.22403.7 (parent: Microsoft.NET.Sdk

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

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-rc.1.22403.11 -> To Version 7.0.100-rc.1.22403.22

Dependency coherency updates

Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset
 From Version 7.0.0-rc.1.22403.3 -> To Version 7.0.0-rc.1.22403.7 (parent: Microsoft.NET.Sdk

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

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-rc.1.22403.11 -> To Version 7.0.100-rc.1.22403.24

Dependency coherency updates

Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset
 From Version 7.0.0-rc.1.22403.3 -> To Version 7.0.0-rc.1.22403.7 (parent: Microsoft.NET.Sdk

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

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-rc.1.22403.11 -> To Version 7.0.100-rc.1.22403.25

Dependency coherency updates

Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset
 From Version 7.0.0-rc.1.22403.3 -> To Version 7.0.0-rc.1.22403.13 (parent: Microsoft.NET.Sdk

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

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-rc.1.22403.11 -> To Version 7.0.100-rc.1.22403.26

Dependency coherency updates

Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset
 From Version 7.0.0-rc.1.22403.3 -> To Version 7.0.0-rc.1.22403.13 (parent: Microsoft.NET.Sdk

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

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-rc.1.22403.11 -> To Version 7.0.100-rc.1.22404.1

Dependency coherency updates

Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset
 From Version 7.0.0-rc.1.22403.3 -> To Version 7.0.0-rc.1.22403.13 (parent: Microsoft.NET.Sdk

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

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-rc.1.22403.11 -> To Version 7.0.100-rc.1.22404.2

Dependency coherency updates

Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset
 From Version 7.0.0-rc.1.22403.3 -> To Version 7.0.0-rc.1.22403.14 (parent: Microsoft.NET.Sdk

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

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-rc.1.22403.11 -> To Version 7.0.100-rc.1.22404.3

Dependency coherency updates

Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks
 From Version 7.0.0-rc.1.22403.3 -> To Version 7.0.0-rc.1.22403.14 (parent: Microsoft.NET.Sdk

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

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-rc.1.22403.11 -> To Version 7.0.100-rc.1.22404.4

Dependency coherency updates

Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.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.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-rc.1.22402.10 -> To Version 7.0.0-rc.1.22403.8 (parent: Microsoft.NET.Sdk

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

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-rc.1.22403.11 -> To Version 7.0.100-rc.1.22404.5

Dependency coherency updates

Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.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.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-rc.1.22402.10 -> To Version 7.0.0-rc.1.22403.8 (parent: Microsoft.NET.Sdk

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

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-rc.1.22403.11 -> To Version 7.0.100-rc.1.22404.6

Dependency coherency updates

Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.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.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-rc.1.22402.10 -> To Version 7.0.0-rc.1.22403.8 (parent: Microsoft.NET.Sdk

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

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-rc.1.22403.11 -> To Version 7.0.100-rc.1.22404.7

Dependency coherency updates

Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.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.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-rc.1.22402.10 -> To Version 7.0.0-rc.1.22403.8 (parent: Microsoft.NET.Sdk

* Remove backported nuget-client source-build patch

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

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-rc.1.22403.11 -> To Version 7.0.100-rc.1.22404.10

Dependency coherency updates

Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.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.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-rc.1.22402.10 -> To Version 7.0.0-rc.1.22403.8 (parent: Microsoft.NET.Sdk

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: MichaelSimons <msimons@microsoft.com>
2022-08-04 18:49:22 -05:00
Marc Paine
9d5facb590
Merge branch 'release/6.0.4xx' into merge/release/6.0.3xx-to-release/6.0.4xx 2022-08-02 17:11:45 -07:00
Marc Paine
91727aeb14
Merge branch 'release/6.0.3xx' into merge/release/6.0.1xx-to-release/6.0.3xx 2022-08-02 12:55:16 -07:00
Michael Simons
91aac0f3fa
Update Runtime's Roslyn version to be the source-built version (#14221) 2022-07-29 21:23:30 +00:00
Marc Paine
cf729ea84f Fix the 6.0 WD template bundles to use the 6.0 templates. 2022-07-28 13:34:38 -07:00
dotnet-maestro[bot]
f760239f41
[main] Update dependencies from dotnet/sdk (#14170)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 7.0.0-rc.1.22366.1 to 7.0.0-rc.1.22376.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0: from 7.0.0-rc.1.22366.1 to 7.0.0-rc.1.22376.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0: from 7.0.0-rc.1.22366.1 to 7.0.0-rc.1.22376.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 7.0.0-rc.1.22367.4 to 7.0.0-rc.1.22376.8 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.TargetingPack.x64.7.0: from 7.0.0-rc.1.22367.4 to 7.0.0-rc.1.22376.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-rc.1.22367.4 to 7.0.0-rc.1.22376.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 7.0.0-rc.1.22367.4 to 7.0.0-rc.1.22376.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 7.0.0-rc.1.22367.4 to 7.0.0-rc.1.22376.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 7.0.0-rc.1.22367.4 to 7.0.0-rc.1.22376.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 7.0.0-rc.1.22368.6 to 7.0.0-rc.1.22377.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-rc.1.22368.6 to 7.0.0-rc.1.22377.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-rc.1.22368.6 to 7.0.0-rc.1.22377.2 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-rc.1.22368.6 to 7.0.0-rc.1.22377.2 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 7.0.0-rc.1.22368.6 to 7.0.0-rc.1.22377.2 (parent: Microsoft.NET.Sdk)
  - dotnet-user-jwts: from 7.0.0-rc.1.22368.6 to 7.0.0-rc.1.22377.2 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 7.0.0-rc.1.22368.6 to 7.0.0-rc.1.22377.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Common.ItemTemplates: from 7.0.100-rc.1.22368.5 to 7.0.100-rc.1.22377.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.TemplateEngine.Cli: from 7.0.100-rc.1.22368.5 to 7.0.100-rc.1.22377.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-rc.1.22366.1 to 7.0.0-rc.1.22376.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 7.0.0-rc.1.22364.3 to 7.0.0-rc.1.22370.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-rc.1.22366.1 to 7.0.0-rc.1.22376.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 7.0.0-rc.1.22364.7 to 7.0.0-rc.1.22370.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.FSharp.Compiler: from 12.0.6-beta.22366.1 to 12.0.6-beta.22376.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.SourceBuild.Intermediate.fsharp: from 6.0.6-beta.22366.1 to 6.0.6-beta.22376.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.Test.Sdk: from 17.4.0-preview-20220715-02 to 17.4.0-preview-20220727-01 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.ILLink.Tasks: from 7.0.100-1.22368.1 to 7.0.100-1.22377.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 4.4.0-1.22367.2 to 4.4.0-2.22377.14 (parent: Microsoft.NET.Sdk)
  - Microsoft.Build: from 17.4.0-preview-22366-04 to 17.4.0-preview-22375-01 (parent: Microsoft.NET.Sdk)
  - NuGet.Build.Tasks: from 6.4.0-preview.1.6 to 6.4.0-preview.1.17 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-rc.1.22367.4 to 7.0.0-rc.1.22376.8 (parent: Microsoft.NET.Sdk)

 - Merge branch 'main' into darc-main-9ab2355d-f3b4-4448-b7ae-90bca2c547ca

 - Merge branch 'main' of https://github.com/dotnet/installer into darc-main-9ab2355d-f3b4-4448-b7ae-90bca2c547ca

 - Resolve source-build patch conflicts

 - Merge branch 'main' of https://github.com/dotnet/installer into darc-main-9ab2355d-f3b4-4448-b7ae-90bca2c547ca

 - Remove backported source-build sdk patch

 - Remove backported fsharp source-build patch
2022-07-28 08:49:52 +00:00
Michael Simons
2f6eeee923
Remove unused xliff-task patch (#14201) 2022-07-26 21:39:44 +00:00
Michael Simons
9fae129964
Remove unnecessary patches (#14200) 2022-07-26 17:37:47 +00:00
Michael Simons
e7f755308e
Update source-build dotnet toolset and previous artifacts (#14089) 2022-07-25 19:55:53 -05:00
Michael Simons
ace7452f3b
Disable repo prebuilt baseline during tarball builds (#14192) 2022-07-22 15:27:51 -05:00
Jason Zhai
9fd920937e Merge branch 'release/6.0.4xx' into main 2022-07-21 19:19:37 -07:00
Marc Paine
55859829cd
Actually update implicit version to 3.1.28 (#14187) 2022-07-21 10:56:34 -07:00
Logan Bussell
e4d35dc39d
Fix source-build tarball build in main (#14162)
* Add runtime patch to fully qualify conflicting runtime and roslyn APIs

* Delete unnecessary aspnetcore patches

* Use repo name for git-info version number special cases
2022-07-21 02:38:12 +00:00
Matt Mitchell
a9d6b28f1e
Re-support in-build signing (#14165)
Add back in support for in-build signing. This is actually even simpler than it was before, because arcade added support for signing wixpacks. So there is no need to do the iterative sign->pack->sign->pack process that was previously common in any repo that creates an installer. Instead, the normal sign target in the arcade SDK build process will simply process all of the files to sign.
Post-build signing remains the default, but will be flipped once verification is complete
2022-07-20 10:41:49 -07:00
Marc Paine
c9dc0c539f
Merge pull request #14122 from dotnet/marcpopMSFT-add3.1arm64templates
Include the 3.1 arm64 templates
2022-07-15 09:30:22 -07:00