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

24079 commits

This branch
This branch
All branches
Author SHA1 Message Date
DotNet Bot
54e6b93101 Merged PR 26802: [internal/release/6.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 6.0.10 to 6.0.11 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.10-servicing.22476.6 to 6.0.11-servicing.22517.3 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.10-servicing.22476.6 to 6.0.11-servicing.22517.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 6.0.10 to 6.0.11 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.10-servicing.22476.5 to 6.0.11-servicing.22514.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.10 to 6.0.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.10 to 6.0.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.Platforms**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.10 to 6.0.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.10-servicing.22476.17 to 6.0.11-servicing.22511.16 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.11 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22476.17 to 6.0.11-servicing.22511.16 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.10-servicing.22476.17 to 6.0.11-servicing.22511.16 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.10-servicing.22476.17 to 6.0.11-servicing.22511.16 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.110 to 6.0.111 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.110-servicing.22476.19 to 6.0.111-servicing.22517.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.110 to 6.0.111 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.10-servicing.22476.6 to 6.0.11-servicing.22513.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.10-servicing.224...
 2022-10-18 06:05:07 +00:00
DotNet Bot
c66f84e95d Merged PR 26823: [internal/release/6.0.3xx] 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 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.11-servicing.22513.9 to 6.0.11-servicing.22517.3 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.11-servicing.22513.9 to 6.0.11-servicing.22517.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.10-servicing.22476.6 to 6.0.11-servicing.22513.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.10-servicing.22476.4 to 6.0.11-servicing.22517.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)

[marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9
- **Build**: 20221017.22
- **Date Produced**: October 17, 2022 9:54:53 PM UTC
- **Commit**: 7a9f7daae15db5611a881fad3f94502a61f976c5
- **Branch**: refs/heads/internal/release/6.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.306-servicing.22517.5 to 6.0.306-servicing.22517.22][1]
  - **Microsoft.NET.Sdk**: [from 6.0.306-servicing.22517.5 to 6.0.306-servicing.22517.22][1]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.11 to 6.0.11][2]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22513.9 to 6.0.11-servicing.22517.3][2]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22513.9 to 6.0.11-servicing.22517.3][2]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2]
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.10-servicing.22476.6 to 6.0.11-servicing.22513.6][3]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.10-servicing.22476.4 to 6.0.11-servicing.22517.1][4]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC1ebf05b&targetVersion=GC7a9f7da&_a=files
[2]: https://dev.a...
 2022-10-18 04:13:25 +00:00
DotNet-Bot
b02da18b8f Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20221017.23 
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.110-servicing.22476.46 -> To Version 6.0.111-servicing.22517.23

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,VS.Redist.Common.NetCore.SharedFramework.x64.6.0
 From Version 6.0.10 -> To Version 6.0.11 (parent: Microsoft.NET.Sdk
 2022-10-18 01:20:13 +00:00
DotNet Bot
a057a1e166 Merged PR 26446: [internal/release/6.0.3xx] Update dependencies from dotnet/source-build-reference-packages 
This pull request updates the following dependencies

[marker]: <> (Begin:4fe19a4b-6691-493a-bfdf-08da32c0fb1e)
## From https://github.com/dotnet/source-build-reference-packages
- **Subscription**: 4fe19a4b-6691-493a-bfdf-08da32c0fb1e
- **Build**: 20221013.1
- **Date Produced**: October 13, 2022 2:49:18 PM UTC
- **Commit**: 2477d388d8663fe6a3f1c82376600dbb19bd217d
- **Branch**: refs/heads/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.SourceBuild.Intermediate.source-build-reference-packages**: [from 6.0.0-servicing.22464.1 to 6.0.0-servicing.22513.1][4]

[4]: 59e601c...2477d38

[DependencyUpdate]: <> (End)

[marker]: <> (End:4fe19a4b-6691-493a-bfdf-08da32c0fb1e)
 2022-10-18 00:16:57 +00:00
MichaelSimons
1d431b292f Update source-build CI to not arm64 leg on internal PRs 2022-10-17 22:16:46 +00:00
DotNet Bot
f214b1e1f3 Merged PR 26801: [internal/release/6.0.3xx] 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.DotNet.Common.ItemTemplates**: from 6.0.306 to 6.0.306 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.306-servicing.22512.10 to 6.0.306-servicing.22517.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.306 to 6.0.306 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)

[marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9
- **Build**: 20221017.5
- **Date Produced**: October 17, 2022 4:49:20 PM UTC
- **Commit**: 1ebf05b4301e6b29d0288178c184931b2976a58d
- **Branch**: refs/heads/internal/release/6.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.306-servicing.22515.1 to 6.0.306-servicing.22517.5][1]
  - **Microsoft.NET.Sdk**: [from 6.0.306-servicing.22515.1 to 6.0.306-servicing.22517.5][1]
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.306 to 6.0.306][2]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.306-servicing.22512.10 to 6.0.306-servicing.22517.2][2]
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.306 to 6.0.306][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC985b54a&targetVersion=GC1ebf05b&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC721ed1f&targetVersion=GC9303db7&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9)
 2022-10-17 22:03:02 +00:00
DotNet-Bot
cebd153a5a Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20221017.6 
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.110-servicing.22476.46 -> To Version 6.0.111-servicing.22517.6

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0
 From Version 6.0.10 -> To Version 6.0.11 (parent: Microsoft.NET.Sdk
 2022-10-17 17:17:48 +00:00
dotnet-bot
0975e3111d Merge in 'release/6.0.3xx' changes 2022-10-17 05:58:18 +00:00
v-wuzhai
5dbbf5bf9a
Merge pull request #14773 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-10-16 22:47:56 -07:00
Jason Zhai
1ec81a05e2 Merge branch 'release/6.0.1xx' into release/6.0.3xx 2022-10-16 19:20:44 -07:00
DotNet Bot
02944f5bd9 Merged PR 26602: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk 
This pull request updates the following dependencies

[marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9
- **Build**: 20221015.1
- **Date Produced**: October 16, 2022 7:17:41 AM UTC
- **Commit**: 985b54a445c3c09e95d3f1397f26fccd32be3745
- **Branch**: refs/heads/internal/release/6.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.305-servicing.22476.47 to 6.0.306-servicing.22515.1][4]
  - **Microsoft.NET.Sdk**: [from 6.0.305-servicing.22476.47 to 6.0.306-servicing.22515.1][4]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.10 to 6.0.11][5]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.10-servicing.22476.6 to 6.0.11-servicing.22513.9][5]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.10-servicing.22476.6 to 6.0.11-servicing.22513.9][5]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.10-servicing.22476.5 to 6.0.11-servicing.22514.6][6]
  - **Microsoft.NETCore.App.Ref**: [from 6.0.10 to 6.0.11][6]
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.10-servicing.22476.5 to 6.0.11-servicing.22514.6][6]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.10 to 6.0.11][6]
  - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.10 to 6.0.11][6]
  - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.10 to 6.0.11][6]
  - **Microsoft.NETCore.Platforms**: [from 6.0.6 to 6.0.7][6]
  - **Microsoft.AspNetCore.App.Ref**: [from 6.0.10 to 6.0.11][7]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.10-servicing.22476.17 to 6.0.11-servicing.22507.1][7]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.10 to 6.0.11][7]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.10-servicing.22476.17 to 6.0.11-servicing.22507.1][7]
  - **dotnet-dev-certs**: [from 6.0.10-servicing.22476.17 to 6.0.11-servicing.22507.1][7]
  - **dotnet-user-secrets**: [from 6.0.10-servicing.22476.17 to 6.0.11-servicing.22507.1][7]
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.305 to 6.0.306][8]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.305-servicing.22476.20 to 6.0.306-servicing.22512.10][8]
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.305 to 6.0.306][8]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.10 to 6.0.11][5]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.10 to 6.0.11][5]

[4]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC0c33071&targetVersion=GC985b54a&_a=files
[5]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC74607da&targetVersion=GCc71eacb&_a=files
[6]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC5a400c2&targetVersion=GCc672e90&_a=files
[7]: https://dev.a...
 2022-10-17 02:12:55 +00:00
DotNet-Bot
5a264cedf4 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20221015.1 
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.305-servicing.22476.47 -> To Version 6.0.306-servicing.22515.1

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64
 From Version 6.0.10 -> To Version 6.0.11 (parent: Microsoft.NET.Sdk
 2022-10-16 07:45:44 +00:00
Matt Mitchell
e582ffed07
Merge pull request #14713 from vseanreesermsft/internal-merge-6.0.1xx-2022-10-11-1010 
Merging internal commits for release/6.0.1xx
 2022-10-14 15:30:35 -07:00
DotNet-Bot
15885a4d76 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20221014.20 
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.305-servicing.22476.47 -> To Version 6.0.306-servicing.22514.20
 2022-10-14 21:42:49 +00:00
dotnet-bot
01478152c0 Merge in 'release/6.0.3xx' changes 2022-10-14 19:19:03 +00:00
Matt Mitchell
6f28e25768
Merge pull request #14714 from vseanreesermsft/internal-merge-6.0.3xx-2022-10-11-1010 
Merging internal commits for release/6.0.3xx
 2022-10-14 12:06:56 -07:00
Marc Paine
2932e0cd7c
Merge branch 'release/6.0.1xx' into internal-merge-6.0.1xx-2022-10-11-1010 2022-10-14 10:06:10 -07:00
Matt Mitchell
a3ce748718 Merged PR 26743: Merge from public 
- Please add description for changes you are making.
- If there is an issue related to this PR, please add the reference.
 2022-10-14 16:57:56 +00:00
Matt Mitchell
4961cd6121 Merge remote-tracking branch 'upstream/release/6.0.1xx' into merge-internal/release/6.0.1xx 2022-10-14 09:32:14 -07:00
dotnet-bot
11e39a03dc Merge in 'release/6.0.3xx' changes 2022-10-14 10:16:19 +00:00
v-wuzhai
810dd2b330
Merge pull request #14758 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-10-14 03:05:14 -07:00
Jason Zhai
c3379f83f3 Merge branch 'release/6.0.1xx' into release/6.0.3xx 2022-10-13 19:37:29 -07:00
Noah Gilson
8372424d0f
Merge pull request #14754 from dotnet/darc-release/6.0.1xx-44dbe71f-b45c-4fc7-88c6-78195b0f111d 
[release/6.0.1xx] Update dependencies from dotnet/arcade
 2022-10-13 15:38:45 -07:00
dotnet-maestro[bot]
dd7d88e075 Update dependencies from https://github.com/dotnet/arcade build 20221012.3 
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 6.0.0-beta.22463.7 -> To Version 6.0.0-beta.22512.3
 2022-10-13 17:47:09 +00:00
dotnet-bot
ffee7bfe73 Merge in 'release/6.0.3xx' changes 2022-10-13 10:31:45 +00:00
v-wuzhai
8226f3fd22
Merge pull request #14744 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-10-13 03:20:25 -07:00
Jason Zhai
808d78865b Merge branch 'release/6.0.1xx' into release/6.0.3xx 2022-10-12 19:28:52 -07:00
dotnet-bot
6939761778 Merge in 'release/6.0.1xx' changes 2022-10-13 02:02:33 +00:00
William Godbe
1a77d838c5
Update asp.net templates (#14686) 2022-10-13 01:51:21 +00:00
dotnet-bot
46766171dc Merge in 'release/6.0.3xx' changes 2022-10-12 23:54:53 +00:00
William Godbe
0de6184891
Update asp.net templates (#14687) 2022-10-12 23:43:50 +00:00
dotnet-bot
24f86f2a44 Merge in 'release/6.0.3xx' changes 2022-10-12 21:25:39 +00:00
dotnet-maestro-bot
0263b7b7da
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#14726) 
* [release/6.0.1xx] Enable online and offline source-build tarball build in all PRs (#14711)

* Enable online and offline source-build tarball build in all PRs (#14620)

* Fix source-build CI to not run tarball build when tarball creation fails (#14678)

* Fix source-build CI to not run tarball build when tarball creation failed

* Bad fix

* Revert test patch

* update global.json and Versions.props for .NET SDK 6.0.110 (#14717)

* [release/6.0.1xx] Re-write dotnet-watch smoke test (#14367)

* Re-write dotnet-watch smoke test

* Revert async changes

* Disable source-build tarball validation for non 6.0.1xx legs

Co-authored-by: Michael Simons <msimons@microsoft.com>
Co-authored-by: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com>
Co-authored-by: Logan Bussell <loganbussell@microsoft.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
 2022-10-12 16:14:53 -05:00
dotnet-bot
242c0b825d Merge in 'release/6.0.1xx' changes 2022-10-12 02:08:25 +00:00
Logan Bussell
7aec869534
[release/6.0.1xx] Re-write dotnet-watch smoke test (#14367) 
* Re-write dotnet-watch smoke test

* Revert async changes
 2022-10-12 01:57:55 +00:00
dotnet-bot
370f0f78ba Merge in 'release/6.0.1xx' changes 2022-10-11 23:55:07 +00:00
NET Source-Build Bot
c12ac467c7
update global.json and Versions.props for .NET SDK 6.0.110 (#14717) 2022-10-11 23:42:38 +00:00
dotnet-bot
4f2e801ec4 Merge in 'release/6.0.1xx' changes 2022-10-11 21:45:58 +00:00
Michael Simons
96efc2a855
[release/6.0.1xx] Enable online and offline source-build tarball build in all PRs (#14711) 
* Enable online and offline source-build tarball build in all PRs (#14620)

* Fix source-build CI to not run tarball build when tarball creation fails (#14678)

* Fix source-build CI to not run tarball build when tarball creation failed

* Bad fix

* Revert test patch
 2022-10-11 16:35:00 -05:00
dotnet-bot
6be4d652fd Merge in 'release/6.0.3xx' changes 2022-10-11 20:11:58 +00:00
Marc Paine
2d21c668bb
Merge pull request #14716 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-10-11 13:00:09 -07:00
dotnet-bot
5ffd39f5d4 Merge in 'release/6.0.1xx' changes 2022-10-11 18:54:35 +00:00
Chris Rummel
b389d53439
Add support for using --with-packages with smoke-tests. (#14387) (#14587) 
* Add support for using --with-packages with smoke-tests.

* Use a better variable name for custom packages directory.

* Swap conditions so we don't have to delete the archive directory.  Fixes https://github.com/dotnet/source-build/issues/2900.

* Update src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs

Co-authored-by: Michael Simons <msimons@microsoft.com>

* Address review feedback.

Co-authored-by: Michael Simons <msimons@microsoft.com>

Co-authored-by: Michael Simons <msimons@microsoft.com>
 2022-10-11 13:43:26 -05:00
dotnet-bot
8138c1ed15 Merge in 'release/6.0.1xx' changes 2022-10-11 17:35:20 +00:00
Marc Paine
f1161af25c
Merge pull request #14477 from ayakael/backports/pr-12516-to-release/6.0.1xx 
[release/6.0.1xx] GetRuntimeInformation.targets: determine PortableProductMonikerRid based on OSName and Architecture. (backports #12516)
 2022-10-11 10:24:07 -07:00
Sean Reeser
7c180f0813 Merge commit 'de9a4b2f4b9f62cdf5b4a94cb66f9125e37b2a5c' into internal-merge-6.0.3xx-2022-10-11-1010 2022-10-11 10:10:52 -07:00
Sean Reeser
b263fe6a97 Merge commit 'ce0a42998a3d2a725f5bd08413b140d907f48177' into internal-merge-6.0.1xx-2022-10-11-1010 2022-10-11 10:10:43 -07:00
DotNet-Bot
534d512b43 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20221010.34 
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.305-servicing.22476.47 -> To Version 6.0.306-servicing.22510.34
 2022-10-11 06:15:30 +00:00
DotNet-Bot
0fa6d987c6 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20221010.22 
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.305-servicing.22476.47 -> To Version 6.0.305-servicing.22510.22
 2022-10-11 01:07:10 +00:00
dotnet-bot
03ca8c17e1 Merge in 'release/6.0.3xx' changes 2022-10-06 21:35:16 +00:00