Commit graph

5076 commits

Author SHA1 Message Date
Marc Paine
a4ec49fae3
Fix the swr file logic
It was supposed to be && and not || to avoid copying those files
2023-04-21 10:14:05 -07:00
v-wuzhai
ea888ffd79
[automated] Merge branch 'release/7.0.3xx' => 'release/7.0.4xx' (#16126) 2023-04-17 19:42:15 -07:00
Marc Paine
0f9a87bd8e Include the swr file in the nuget package 2023-04-14 15:22:44 -07:00
Jason Zhai
9270b32915 Merge branch 'release/7.0.2xx' into release/7.0.3xx 2023-04-13 19:32:13 -07:00
Jason Zhai
a0351ad7c1 Merge branch 'release/7.0.2xx' into release/7.0.3xx 2023-04-12 19:59:09 -07:00
Jason Zhai
58f6df6554 Merge branch 'release/7.0.1xx' into release/7.0.2xx 2023-04-12 19:56:47 -07:00
Matt Thalman
eec4c56c89
Update SB test baselines (#16078) 2023-04-12 20:23:40 +00:00
Jason Zhai
21c8e13b80 Merge branch 'release/7.0.1xx' into release/7.0.2xx 2023-04-11 19:49:06 -07:00
NET Source-Build Bot
0be0ea84df
.NET Source-Build 7.0.105 April 2023 Updates (#16049)
Co-authored-by: Matt Thalman <mthalman@microsoft.com>
2023-04-11 23:06:32 +00:00
Jason Zhai
ed3a8bec19 Merge branch 'release/7.0.2xx' into release/7.0.3xx 2023-04-05 20:07:03 -07:00
Jason Zhai
32ca736228 Merge branch 'release/7.0.1xx' into release/7.0.2xx 2023-03-27 23:56:01 -07:00
Chris Rummel
7a0e084715
Shutdown the build server before each build. (#15894)
Co-authored-by: Michael Simons <msimons@microsoft.com>
2023-03-27 14:42:15 -05:00
Jason Zhai
405a0cb56d Merge branch 'release/7.0.2xx' into release/7.0.3xx 2023-03-20 22:53:05 -07:00
Jason Zhai
b5ff817e03 Merge branch 'release/7.0.1xx' into release/7.0.2xx 2023-03-20 19:50:16 -07:00
Chris Rummel
c3ca49df5b
Merge branch 'release/7.0.1xx' into merge/release/6.0.4xx-to-release/7.0.1xx 2023-03-20 14:46:28 -05:00
Jason Zhai
1096da4857 Merge branch 'release/7.0.2xx' into release/7.0.3xx 2023-03-16 19:41:54 -07:00
Jason Zhai
fe9bb2191e Merge branch 'release/7.0.1xx' into release/7.0.2xx 2023-03-15 19:52:12 -07:00
Jason Zhai
6f79e0b9da Merge branch 'release/6.0.3xx' into release/6.0.4xx 2023-03-15 19:46:46 -07:00
Chris Rummel
f7fbfe43cd
Source-build 7.0.104 March 2023 updates. (#15800) 2023-03-15 18:33:01 -05:00
Marc Paine
251dc81c5e
Merge branch 'release/6.0.3xx' into merge/release/6.0.1xx-to-release/6.0.3xx 2023-03-15 12:58:21 -07:00
Chris Rummel
89cf0a81c7
Source-build 6.0.115 March 2023 updates. (#15799) 2023-03-15 11:03:37 -05:00
Marc Paine
d8e8f7a055
Merging internal commits for release/7.0.2xx (#15794) 2023-03-14 11:18:26 -07:00
Sean Reeser
b72a2d6071 Merge commit '6c74320bc3ea80d03493a069e4c424b19a5a1983' into internal-merge-7.0.2xx-2023-03-14-1018 2023-03-14 10:18:09 -07:00
Tom Deseyn
b672d91789
DotNetHelper: fix IsMonoRuntime being initialized before extracting the sdk. (#15646) 2023-03-14 08:03:24 -05:00
wtgodbe
67e4bf2cf0 Automate asp.net template updates into dotnet/installer 2023-03-13 14:07:05 -07:00
wtgodbe
0618b2c20d Automate asp.net template updates into dotnet/installer 2023-03-13 14:02:57 -07:00
wtgodbe
6a0adcbcc0 Generalize 2023-03-10 10:12:51 -08:00
Jason Zhai
ca3926094a Merge branch 'release/7.0.2xx' into release/7.0.3xx 2023-03-09 21:57:02 -08:00
Jason Zhai
f8496d511c Merge branch 'release/6.0.3xx' into release/6.0.4xx 2023-03-09 21:49:55 -08:00
Jason Zhai
5a8e9580e9 Merge branch 'release/7.0.2xx' into release/7.0.3xx 2023-03-07 22:00:28 -08:00
Jason Zhai
5b6fe1117a Merge branch 'release/7.0.1xx' into release/7.0.2xx 2023-03-07 18:51:58 -08:00
Jason Zhai
6eee81f109 Merge branch 'release/6.0.3xx' into release/6.0.4xx 2023-03-07 18:42:11 -08:00
Jason Zhai
7514796e54 Merge branch 'release/6.0.1xx' into release/6.0.3xx 2023-03-07 18:38:58 -08:00
Marc Paine
e47e22aac6
[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.2xx' (#15576) 2023-03-07 16:54:54 -08:00
Chris Rummel
a4ecf7bfc0
Update poison usage baseline. (#15688) 2023-03-03 08:55:03 -06:00
Nikola Milosavljevic
8b853a54c1
[release/6.0.1xx] SDK diff exclusions - backport (#15676) 2023-03-02 09:04:12 -06:00
Nikola Milosavljevic
c964d85026
[release/7.0.1xx] SDK diff exclusions - backport (#15670) 2023-03-01 11:05:57 -06: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
Omair Majid
df0fc12896
Add Alpine CI for source-build (#14417)
Co-authored-by: Michael Simons <msimons@microsoft.com>
2023-02-22 12:51:32 -06:00
Tom Deseyn
9a9449b598
tests: ExecuteRunWeb: update expected SIGTERM exit code on mono. (#15341)
Co-authored-by: Michael Simons <msimons@microsoft.com>
2023-02-22 09:52:28 -06:00
v-wuzhai
9888cb4fae
Change how VS setup authoring is configured. (#15552) 2023-02-22 15:44:48 +08:00
8616a1d236
[release/6.0.1xx] Arm support (#13378) 2023-02-21 15:44:46 -06: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
5d9462454d Update implicit version for March release 2023-02-21 00:37:18 -08:00
Jason Zhai
ab517a4292 Merge branch 'release/7.0.1xx' into release/7.0.2xx 2023-02-19 22:29:21 -08:00
Jason Zhai
f707b71546 Merge branch 'release/6.0.1xx' into release/6.0.3xx 2023-02-19 22:23:44 -08:00
Chris Rummel
914b24dcdd
.NET Source-Build 6.0.114 February 2023 Updates (#15560) 2023-02-17 10:28:43 -06:00
Chris Rummel
c32738ee77
.NET Source-Build 7.0.103 February 2023 Updates (#15561) 2023-02-16 17:26:44 -06:00
Jason Zhai
07cf20f87b Merge branch 'release/7.0.2xx' into release/7.0.3xx 2023-02-14 22:35:33 -08:00