Commit graph

5016 commits

Author SHA1 Message Date
dotnet-bot
2d37618759 Merge in 'release/7.0.2xx' changes 2023-03-08 01:03:40 +00:00
Marc Paine
e47e22aac6
[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.2xx' (#15576) 2023-03-07 16:54:54 -08:00
dotnet-bot
b9926d6812 Merge in 'release/7.0.2xx' changes 2023-02-27 17:23:41 +00:00
Marc Paine
7d72c5a676
Increase branding version and downgrade implicit version to enable hotfix release (#15587) 2023-02-27 09:13:26 -08:00
DotNet Bot
4946228186 Merged PR 29723: [internal/release/7.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies

[marker]: <> (Begin:Coherency Updates)
## Coherency Updates

The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)

[DependencyUpdate]: <> (Begin)

- **Coherency Updates**:
  - **Microsoft.WindowsDesktop.App.Ref**: from 7.0.3 to 7.0.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.3-servicing.23073.3 to 7.0.4-servicing.23118.3 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.3-servicing.23073.3 to 7.0.4-servicing.23118.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 7.0.3 to 7.0.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.3-servicing.23069.10 to 7.0.4-servicing.23115.8 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.3 to 7.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.3 to 7.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.3 to 7.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.Platforms**: from 7.0.0 to 7.0.1 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 7.0.3 to 7.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.3-servicing.23080.9 to 7.0.4-servicing.23119.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.3 to 7.0.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.3-servicing.23080.9 to 7.0.4-servicing.23119.3 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 7.0.3-servicing.23080.9 to 7.0.4-servicing.23119.3 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-jwts**: from 7.0.3-servicing.23080.9 to 7.0.4-servicing.23119.3 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 7.0.3-servicing.23080.9 to 7.0.4-servicing.23119.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.3 to 7.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.3-servicing.23072.1 to 7.0.4-servicing.23117.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.3 to 7.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.3-servicing.23073.1 to 7.0.4-servicing.23117.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.Net.Compilers.Toolset**: from 4.5.0-3.23070.7 to 4.5.0-6.23109.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Build**: from 17.5.0-preview-23061-01 to 17.5.0 (par...
2023-02-21 20:55:43 +00:00
Jason Zhai
ab517a4292 Merge branch 'release/7.0.1xx' into release/7.0.2xx 2023-02-19 22:29:21 -08:00
Chris Rummel
c32738ee77
.NET Source-Build 7.0.103 February 2023 Updates (#15561) 2023-02-16 17:26:44 -06:00
vseanreesermsft
3cc0821abb
Merging internal commits for release/7.0.2xx (#15537)
Co-authored-by: DotNet Bot <dn-bot@microsoft.com>
Co-authored-by: Matt Mitchell <mmitche@microsoft.com>
2023-02-14 13:55:20 -08:00
vseanreesermsft
1fcdbe277d
Merging internal commits for release/7.0.1xx (#15536)
Co-authored-by: dotnet-bot <dotnet-bot@microsoft.com>
Co-authored-by: DotNet-Bot <dn-bot@microsoft.com>
Co-authored-by: Chris Rummel <crummel@microsoft.com>
Co-authored-by: Marc Paine <marcpop@microsoft.com>
2023-02-14 13:55:02 -08:00
dotnet-maestro-bot
11315562cf
[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.2xx' (#15472)
Co-authored-by: Michael Simons <msimons@microsoft.com>
Co-authored-by: Logan Bussell <loganbussell@microsoft.com>
Co-authored-by: Chris Rummel <crummel@microsoft.com>
Co-authored-by: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com>
Co-authored-by: dotnet-bot <dotnet-bot@microsoft.com>
Co-authored-by: Matt Mitchell <mmitche@microsoft.com>
Co-authored-by: DotNet-Bot <dn-bot@microsoft.com>
Co-authored-by: Sean Reeser <v-seanreeser@microsoft.com>
Co-authored-by: Marc Paine <marcpop@microsoft.com>
Co-authored-by: William Godbe <wigodbe@microsoft.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
Co-authored-by: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com>
Co-authored-by: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com>
Co-authored-by: Matt Thalman <mthalman@microsoft.com>
Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Daniel Plaisted <dsplaisted@gmail.com>
2023-02-10 15:57:40 -08:00
Matt Mitchell
e2c796b8c1
[release/7.0.2xx] Update checksum generation order (#15397) (#15482)
Co-authored-by: Michael Simons <msimons@microsoft.com>
2023-02-09 16:08:19 -08:00
Matt Mitchell
0709aa684b
[release/7.0.1xx] Update checksum generation order (#15397) (#15481)
Co-authored-by: Michael Simons <msimons@microsoft.com>
2023-02-09 16:08:09 -08:00
dotnet-maestro-bot
f1da127703
[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.2xx' (#15322)
Co-authored-by: Michael Simons <msimons@microsoft.com>
Co-authored-by: Logan Bussell <loganbussell@microsoft.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
2023-02-07 15:16:13 -08:00
dotnet-maestro-bot
535d6f657c
[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' (#15279)
Co-authored-by: dotnet-bot <dotnet-bot@microsoft.com>
Co-authored-by: Matt Mitchell <mmitche@microsoft.com>
Co-authored-by: DotNet-Bot <dn-bot@microsoft.com>
Co-authored-by: MichaelSimons <msimons@microsoft.com>
Co-authored-by: Chris Rummel <crummel@microsoft.com>
Co-authored-by: Sean Reeser <v-seanreeser@microsoft.com>
Co-authored-by: Marc Paine <marcpop@microsoft.com>
Co-authored-by: William Godbe <wigodbe@microsoft.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
Co-authored-by: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com>
Co-authored-by: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com>
Co-authored-by: Matt Thalman <mthalman@microsoft.com>
Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Daniel Plaisted <dsplaisted@gmail.com>
2023-02-07 15:15:41 -08:00
Chris Rummel
65e657b063 Enable bootstrap in tarball build.
We now expect all builds using the Microsoft-built SDK to also use bootstrap.  Mixed RIDness between the bootstrap SDK and previously-source-built packages is not supported.
2023-02-07 13:18:11 -06:00
Chris Rummel
5533b337bb Disable secure supply chain check.
These issues are checked for in the individual repos - by the time source-build is building the tarball they have already been processed and approved.
2023-02-07 13:18:11 -06:00
Chris Rummel
51ba61a4f9
Replace RID-specific versions with App.Ref versions.
These are expected to be the same version number and cause fewer problems for people who are building on RIDs that do not match our PSB RID.
2023-02-03 16:06:52 -06:00
Chris Rummel
0f737ee974
We do need these but they should be set to the version of the runtime we got, not the one we feed in. 2023-02-03 08:50:44 -06:00
Chris Rummel
64974afa67
Remove source-build manipulation of stable version. 2023-02-03 07:09:26 -06:00
Logan Bussell
e36f7f3fea
[release/7.0.1xx] Add CI for building with N-1 source-built SDK (#15164) 2023-01-23 20:26:27 -06:00
Michael Simons
de87c6c89c
remove unnecessary nowarn from source-build SBRP project (#15302) 2023-01-20 15:55:36 -06:00
Michael Simons
b743cc9964 Revert "Update smoke-tests to target net8"
This reverts commit 9dfa832bb9.
2023-01-20 18:24:00 +00:00
Michael Simons
9dfa832bb9 Update smoke-tests to target net8 2023-01-20 18:05:42 +00:00
Marc Paine
f021b96554
[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.2xx' (#15292) 2023-01-17 17:19:08 -08:00
Marc Paine
f4982059b4
[release/7.0.2xx] Update dependencies from dotnet/sdk (#15256) 2023-01-17 16:37:28 -08:00
NET Source-Build Bot
4192499940
.NET Source-Build 7.0.102 January 2023 Updates (#15251)
Co-authored-by: Chris Rummel <crummel@microsoft.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
2023-01-17 16:52:01 -06:00
Marc Paine
2e8eefd722
Stable branding for 7.0.200 GA (#15277) 2023-01-17 14:49:58 -08:00
Marc Paine
8fd65d532e Update implicit versions 2023-01-13 15:44:57 -08:00
Chris Rummel
4a2d55e922
[release/7.0.1xx] repos/sdk.proj: set NativeAotSupported=false on arm platform (#15039) 2023-01-13 14:12:34 -06:00
Michael Simons
87d18781bc Update sdk version used to build source-build 2023-01-13 15:22:57 +00:00
Michael Simons
269f3acab7 Remove obsolete source-build format patch 2023-01-13 15:14:29 +00:00
Jason Zhai
9250030044 Merge branch 'release/7.0.1xx' into release/7.0.2xx 2023-01-12 22:15:06 -08:00
dotnet-maestro[bot]
0a97afd970
[release/7.0.2xx] Update dependencies from dotnet/sdk (#15198)
[release/7.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Net.Compilers.Toolset: from 4.5.0-2.22613.14 to 4.5.0-3.23054.10 (parent: Microsoft.NET.Sdk)
  - Microsoft.Build: from 17.5.0-preview-23054-01 to 17.5.0-preview-23054-02 (parent: Microsoft.NET.Sdk)

 - Add nowarns for aspnetcore issues from building w/latest toolset
2023-01-05 16:21:01 +00:00
Michael Simons
cb62aeefe3
re-enable dotnet-watch tests (#15148) 2022-12-16 17:33:58 -06:00
dotnet-maestro[bot]
eed7e45af2
[release/7.0.2xx] Update dependencies from dotnet/sdk (#15122)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: MichaelSimons <msimons@microsoft.com>
2022-12-16 08:49:43 -06:00
dotnet-maestro[bot]
5bb11fee92
[release/7.0.2xx] Update dependencies from dotnet/sdk (#15115)
* Update dependencies from https://github.com/dotnet/sdk build 20221209.7

Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.200-preview.22580.54 -> To Version 7.0.200-preview.22609.7

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 12.5.0-beta.22580.6 -> To Version 12.5.0-beta.22608.3 (parent: Microsoft.NET.Sdk

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

Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.200-preview.22580.54 -> To Version 7.0.200-preview.22611.4

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 12.5.0-beta.22580.6 -> To Version 12.5.0-beta.22608.3 (parent: Microsoft.NET.Sdk

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

Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.200-preview.22580.54 -> To Version 7.0.200-preview.22612.1

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 12.5.0-beta.22580.6 -> To Version 12.5.0-beta.22608.3 (parent: Microsoft.NET.Sdk

* Remove backported NuGet source-build patch

* Add source-build patch to address NuGet prebuilt

* Fix source-build patch

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: MichaelSimons <msimons@microsoft.com>
2022-12-12 15:23:09 -06:00
Marc Paine
37821d04a6
Update the implicit versions to match the December release 2022-12-02 14:02:14 -08:00
Noah Gilson
e821c9314e
Merge pull request #15018 from dotnet/darc-release/7.0.2xx-34910bad-72d1-4bc2-9dfa-7d9a8bb8bfd0
[release/7.0.2xx] Update dependencies from dotnet/sdk
2022-11-29 19:52:49 -08:00
Logan Bussell
cd889425aa Add CS9057 nowarn to nuget-client for source-build 2022-11-30 02:22:18 +00:00
Logan Bussell
0f45acfc09 Update nuget-client patch with more props 2022-11-30 02:22:04 +00:00
v-wuzhai
c841ba85d2
Merge pull request #15046 from dotnet-maestro-bot/merge/release/7.0.1xx-to-release/7.0.2xx
[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.2xx'
2022-11-29 01:56:26 -08:00
Chris Rummel
ca64f84e41
Override some versions for nonshipping runtime packages. (#15045)
Source-build 7.0.0 created these packages with an incorrect version number which is stuckthe previously-source-built PVP for the 7.0.1 release.  This causes a problem if bootstapping because the Microsoft versions of these packages don't actually exist, so trying to download them fails.  This change allows us to override the version read out of PVP and set it to the actual version used by runtime.
2022-11-28 17:12:22 -06:00
67c497aaaf
repos/sdk.proj: set NativeAotSupported=false on arm platform 2022-11-28 07:52:59 -05:00
Logan Bussell
d238d9b6b6 Add patch for XDT prebuilt in nuget-client 2022-11-22 00:02:25 +00:00
DotNet Bot
6d964d037c Merged PR 27474: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies

[marker]: <> (Begin:Coherency Updates)
## Coherency Updates

The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)

[DependencyUpdate]: <> (Begin)

- **Coherency Updates**:
  - **Microsoft.WindowsDesktop.App.Ref**: from 7.0.0 to 7.0.1 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.0-rtm.22519.1 to 7.0.1-rtm.22559.2 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.0-rtm.22519.1 to 7.0.1-rtm.22559.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 7.0.0 to 7.0.1 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.0-rtm.22518.5 to 7.0.1-servicing.22568.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.0 to 7.0.1 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.0 to 7.0.1 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.0 to 7.0.1 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 7.0.0 to 7.0.1 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.0-rtm.22518.19 to 7.0.1-servicing.22568.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.0 to 7.0.1 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.0-rtm.22518.19 to 7.0.1-servicing.22568.9 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 7.0.0-rtm.22518.19 to 7.0.1-servicing.22568.9 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-jwts**: from 7.0.0-rtm.22518.19 to 7.0.1-servicing.22568.9 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 7.0.0-rtm.22518.19 to 7.0.1-servicing.22568.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.0 to 7.0.1 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.0 to 7.0.1 (parent: Microsoft.NET.Sdk)
  - **Microsoft.FSharp.Compiler**: from 12.4.0-beta.22513.10 to 12.4.0-beta.22563.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.SourceBuild.Intermediate.fsharp**: from 7.0.0-beta.22513.10 to 7.0.0-beta.22563.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NET.ILLink.Tasks**: from 7.0.100-1.22471.3 to 7.0.100-1.22558.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Net.Compilers.Toolset**: from 4.4.0-4.22520.11 to 4.4.0-6.22565.8 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.0-rtm.22518.5 to 7.0.1-servicing.22568.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NET.Workload.Emscripten.net6.M...
2022-11-21 22:08:31 +00:00
Chris Rummel
28c8bf2dfc Merged PR 27591: Override some versions for nonshipping runtime packages.
Source-build 7.0.0 created these packages with an incorrect version number which is stuck in the previously-source-built PVP for the 7.0.1 release.  This causes a problem if bootstapping because the Microsoft versions of these packages don't actually exist, so trying to download them fails.  This change allows us to override the version read out of PVP and set it to the actual version used by runtime.
2022-11-19 15:41:05 +00:00
Jason Zhai
2bd039723e Merge branch 'release/7.0.1xx' into release/7.0.2xx 2022-11-17 21:41:09 -08:00
Logan Bussell
cf1b55e973
[release/7.0.1xx] Add CI for security-partners-dotnet (#15007)
* Add CI for dotnet-security-partners

Remove nuget configs from all repo submodules

Address code review

Move security-partners ci to tarball/eng dir

Copy out installer NuGet config before build

Fix relative path for installer template

Switch to 20.04 image

* Add nuget-client patch to avoid nuget security scan errors

* Revert "Add nuget-client patch to avoid nuget security scan errors"

This reverts commit 6eca00a41813171019b24597386a9074e2faa07b.

* Remove NuGet.config workaround for security-partners ci
2022-11-17 14:54:43 -08:00
Marc Paine
d4a4c16773
Merge pull request #15005 from dotnet-maestro-bot/merge/release/7.0.1xx-to-release/7.0.2xx
[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.2xx'
2022-11-16 14:31:04 -08:00
MichaelSimons
0cb1ce3471 Disable broken test - noted with follow-up issue 2022-11-15 23:27:29 +00:00