Commit graph

25866 commits

Author SHA1 Message Date
v-wuzhai
d3599cb04c
Merge pull request #14217 from dotnet/darc-main-f14c43c4-2058-4a4f-8baf-285c07ca758f
[main] Update dependencies from dotnet/sdk
2022-07-28 19:15:07 -07:00
dotnet-maestro[bot]
2ec67c0107 Update dependencies from https://github.com/dotnet/sdk build 20220728.10
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-rc.1.22378.9 -> To Version 7.0.100-rc.1.22378.10

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
 From Version 7.0.0-rc.1.22378.2 -> To Version 7.0.0-rc.1.22378.3 (parent: Microsoft.NET.Sdk
2022-07-29 01:10:00 +00:00
dotnet-maestro[bot]
c4fb83ec35
[main] Update dependencies from dotnet/sdk (#14215)
* Update dependencies from https://github.com/dotnet/sdk build 20220728.7

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-rc.1.22378.6 -> To Version 7.0.100-rc.1.22378.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,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-rc.1.22377.10 -> To Version 7.0.0-rc.1.22378.1 (parent: Microsoft.NET.Sdk

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

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-rc.1.22378.6 -> To Version 7.0.100-rc.1.22378.8

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,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-rc.1.22377.10 -> To Version 7.0.0-rc.1.22378.2 (parent: Microsoft.NET.Sdk

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

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-rc.1.22378.6 -> To Version 7.0.100-rc.1.22378.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,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-rc.1.22377.10 -> To Version 7.0.0-rc.1.22378.2 (parent: Microsoft.NET.Sdk

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-07-29 00:32:24 +00:00
Marc Paine
5865c9be09
Merge pull request #14216 from dotnet/darc-main-302b146f-b5c0-4231-b711-0ca4d6876df0
[main] Update dependencies from dotnet/source-build-reference-packages
2022-07-28 16:36:18 -07:00
dotnet-maestro[bot]
f84281ad3d Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220728.2
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 7.0.0-alpha.1.22377.2 -> To Version 7.0.0-alpha.1.22378.2
2022-07-28 20:38:57 +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]
fa2077e0f1
[main] Update dependencies from dotnet/sdk (#14212)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 7.0.0-rc.1.22376.1 to 7.0.0-rc.1.22377.3 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0: from 7.0.0-rc.1.22376.1 to 7.0.0-rc.1.22377.3 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0: from 7.0.0-rc.1.22376.1 to 7.0.0-rc.1.22377.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 7.0.0-rc.1.22376.8 to 7.0.0-rc.1.22377.10 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.TargetingPack.x64.7.0: from 7.0.0-rc.1.22376.8 to 7.0.0-rc.1.22377.10 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-rc.1.22376.8 to 7.0.0-rc.1.22377.10 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 7.0.0-rc.1.22376.8 to 7.0.0-rc.1.22377.10 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 7.0.0-rc.1.22376.8 to 7.0.0-rc.1.22377.10 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 7.0.0-rc.1.22376.8 to 7.0.0-rc.1.22377.10 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 7.0.0-rc.1.22377.5 to 7.0.0-rc.1.22378.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-rc.1.22377.5 to 7.0.0-rc.1.22378.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-rc.1.22377.5 to 7.0.0-rc.1.22378.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-rc.1.22377.5 to 7.0.0-rc.1.22378.1 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 7.0.0-rc.1.22377.5 to 7.0.0-rc.1.22378.1 (parent: Microsoft.NET.Sdk)
  - dotnet-user-jwts: from 7.0.0-rc.1.22377.5 to 7.0.0-rc.1.22378.1 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 7.0.0-rc.1.22377.5 to 7.0.0-rc.1.22378.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-rc.1.22376.1 to 7.0.0-rc.1.22377.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 7.0.0-rc.1.22370.1 to 7.0.0-rc.1.22377.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-rc.1.22376.1 to 7.0.0-rc.1.22377.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 7.0.0-rc.1.22370.2 to 7.0.0-rc.1.22377.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.FSharp.Compiler: from 12.0.6-beta.22376.4 to 12.0.6-beta.22377.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.SourceBuild.Intermediate.fsharp: from 6.0.6-beta.22376.4 to 6.0.6-beta.22377.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 4.4.0-2.22377.17 to 4.4.0-2.22378.2 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-rc.1.22376.8 to 7.0.0-rc.1.22377.10 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.Workload.Emscripten.Manifest-7.0.100: from 7.0.0-rc.1.22362.2 to 7.0.0-rc.1.22368.1 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.7.0)
2022-07-28 20:09:11 +00:00
Logan Bussell
bf0dde09fa
Write and upload updated baselines for source-build content tests (#14196) 2022-07-28 13:08:14 -05:00
Marc Paine
10cd2639da
Update Versions.props 2022-07-28 10:02:41 -07:00
Marc Paine
2b091cba5f
Merge pull request #14211 from dotnet/darc-main-7ab20da4-606e-44ba-ac5b-93bce73c17b0
[main] Update dependencies from dotnet/test-templates
2022-07-28 10:00:35 -07:00
Marc Paine
f7d5693950
Merge pull request #14213 from dotnet/darc-main-86bee6a9-9bea-4b28-98a0-67330593baa7
[main] Update dependencies from dotnet/arcade
2022-07-28 10:00:11 -07:00
dotnet-maestro[bot]
d7a4d67024 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220728.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22363.1 -> To Version 6.0.0-servicing.22378.1
2022-07-28 14:53:29 +00:00
dotnet-maestro[bot]
4e420155b0 Update dependencies from https://github.com/dotnet/arcade build 20220727.15
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.22376.3 -> To Version 7.0.0-beta.22377.15

Dependency coherency updates

Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks
 From Version 1.2.0-beta-22374-01 -> To Version 1.2.0-beta-22376-02 (parent: Microsoft.DotNet.Arcade.Sdk
2022-07-28 12:36:53 +00:00
v-wuzhai
5ce6077bf3
Merge pull request #14210 from dotnet/darc-main-cc787e41-8f72-4a85-8451-8a1cf05184b8
[main] Update dependencies from dotnet/sdk
2022-07-28 02:57:15 -07:00
dotnet-maestro[bot]
3634d12122 Update dependencies from https://github.com/dotnet/test-templates build 20220728.1
Microsoft.DotNet.Test.ProjectTemplates.2.1 , Microsoft.DotNet.Test.ProjectTemplates.5.0 , Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0
 From Version 1.0.2-beta4.22369.1 -> To Version 1.0.2-beta4.22378.1
2022-07-28 09:40:38 +00:00
dotnet-maestro[bot]
8f16c44b04 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.Net.Compilers.Toolset,Microsoft.Build
 From Version 7.0.0-rc.1.22377.2 -> To Version 7.0.0-rc.1.22377.5 (parent: Microsoft.NET.Sdk
2022-07-28 08:52:36 +00:00
dotnet-maestro[bot]
0fd5c5c48f Update dependencies from https://github.com/dotnet/sdk build 20220727.24
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-rc.1.22377.20 -> To Version 7.0.100-rc.1.22377.24
2022-07-28 08:52:25 +00:00
dotnet-maestro[bot]
dc7ad7541e Update dependencies from https://github.com/dotnet/sdk build 20220727.20
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-rc.1.22377.19 -> To Version 7.0.100-rc.1.22377.20
2022-07-28 08:52:13 +00: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
Marc Paine
d3951b5923 Fix up the versions as wpf and winforms were different 2022-07-27 14:58:05 -07:00
Marc Paine
3c073ec7c5 Fix the winforms and wpf templates
I grabbed the latest version from the manifest files from the drop that shipped in June
2022-07-27 14:57:57 -07:00
Marc Paine
e222eceecf
Merge pull request #14147 from vlada-shubina/template-version-updates
Bumped common template packages versions
2022-07-27 14:24:42 -07:00
dotnet-maestro[bot]
f95d97b158
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220727.2 (#14206)
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 7.0.0-alpha.1.22375.1 -> To Version 7.0.0-alpha.1.22377.2

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-07-27 14:07:30 -07:00
Marc Paine
c7a13ea04c
Merge pull request #14150 from dotnet/marcpopMSFT-streamlineprmatrix
Simplify our PR builds.
2022-07-27 10:17:19 -07:00
Marc Paine
c3abd30961
Merge pull request #14204 from dotnet/darc-main-cc2c84f7-f80b-4db3-9d2c-4044b4db3074
[main] Update dependencies from dotnet/arcade
2022-07-27 09:34:22 -07:00
dotnet-maestro[bot]
a6eb5ad33e Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220727.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22363.1 -> To Version 6.0.0-servicing.22377.1
2022-07-27 15:04:08 +00:00
dotnet-maestro[bot]
8ddbc7ff0d Update dependencies from https://github.com/dotnet/arcade build 20220726.3
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.22375.4 -> To Version 7.0.0-beta.22376.3
2022-07-27 12:33:07 +00:00
dotnet-maestro[bot]
46786fe777
Update dependencies from https://github.com/dotnet/arcade build 20220725.4 (#14199)
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.22372.1 -> To Version 7.0.0-beta.22375.4

Dependency coherency updates

Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks
 From Version 1.2.0-beta-22371-01 -> To Version 1.2.0-beta-22374-01 (parent: Microsoft.DotNet.Arcade.Sdk

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-07-26 15:37:52 -07: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
Jason Zhai
a38d1090fc Update fedora docker image tag to latest one 2022-07-25 23:08:53 -07:00
Michael Simons
e7f755308e
Update source-build dotnet toolset and previous artifacts (#14089) 2022-07-25 19:55:53 -05:00
dotnet-maestro[bot]
4893d35322
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220725.1 (#14195)
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 7.0.0-alpha.1.22371.2 -> To Version 7.0.0-alpha.1.22375.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-07-25 09:36:26 -07:00
v-wuzhai
53587f98e1
Merge pull request #14193 from dotnet/darc-main-5544c5c4-ff24-4e9a-8dd5-063657c0ee96
[main] Update dependencies from dotnet/arcade
2022-07-24 19:18:50 -07:00
dotnet-maestro[bot]
a530c8186a Update dependencies from https://github.com/dotnet/arcade build 20220722.1
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.22371.8 -> To Version 7.0.0-beta.22372.1

Dependency coherency updates

Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks
 From Version 1.2.0-beta-22370-01 -> To Version 1.2.0-beta-22371-01 (parent: Microsoft.DotNet.Arcade.Sdk
2022-07-23 12:38:15 +00:00
Michael Simons
ace7452f3b
Disable repo prebuilt baseline during tarball builds (#14192) 2022-07-22 15:27:51 -05:00
Marc Paine
ae1aaf7200
Merge pull request #14190 from dotnet/darc-main-0f840f09-23e8-4dc7-a77c-626df5152e16
[main] Update dependencies from dotnet/arcade
2022-07-22 10:24:28 -07:00
Marc Paine
ec7109bf73
Merge pull request #14188 from dotnet-maestro-bot/merge/release/6.0.4xx-to-main
[automated] Merge branch 'release/6.0.4xx' => 'main'
2022-07-22 10:23:46 -07:00
dotnet-maestro[bot]
f6d8ed6077 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220722.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22363.1 -> To Version 6.0.0-servicing.22372.1
2022-07-22 15:45:39 +00:00
dotnet-maestro[bot]
6b540c1d17 Update dependencies from https://github.com/dotnet/arcade build 20220721.8
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.22370.1 -> To Version 7.0.0-beta.22371.8

Dependency coherency updates

Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks
 From Version 1.2.0-beta-22369-02 -> To Version 1.2.0-beta-22370-01 (parent: Microsoft.DotNet.Arcade.Sdk
2022-07-22 12:40:03 +00:00
Jason Zhai
9fd920937e Merge branch 'release/6.0.4xx' into main 2022-07-21 19:19:37 -07:00
Marc Paine
b2beceb5c6
Merge pull request #14186 from dotnet/darc-main-2903a98b-5a63-4d41-9716-ec607e63c401
[main] Update dependencies from dotnet/arcade
2022-07-21 16:19:51 -07:00
dotnet-maestro[bot]
614c81af18
[main] Update dependencies from dotnet/source-build-reference-packages (#14189)
* Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220721.1

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 7.0.0-alpha.1.22368.3 -> To Version 7.0.0-alpha.1.22371.1

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

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 7.0.0-alpha.1.22368.3 -> To Version 7.0.0-alpha.1.22371.2

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-07-21 17:53:28 -05:00
dotnet-bot
7771abd614 Merge in 'release/6.0.4xx' changes 2022-07-21 18:12:09 +00:00
Marc Paine
55859829cd
Actually update implicit version to 3.1.28 (#14187) 2022-07-21 10:56:34 -07:00
Michael Simons
00f8e439e3
Update source-build-externals version (#14185) 2022-07-21 12:19:09 -05:00
dotnet-maestro[bot]
b8c5ccecbc Update dependencies from https://github.com/dotnet/arcade build 20220720.1
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.22369.9 -> To Version 7.0.0-beta.22370.1

Dependency coherency updates

Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks
 From Version 1.2.0-beta-22368-02 -> To Version 1.2.0-beta-22369-02 (parent: Microsoft.DotNet.Arcade.Sdk
2022-07-21 12:39:08 +00: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
Marc Paine
999fa51758
Merge pull request #14180 from dotnet/darc-main-a44e011f-bd5b-4a8e-9155-3cd3346c0a88
[main] Update dependencies from dotnet/arcade
2022-07-20 14:00:44 -07: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