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

4731 commits

Author SHA1 Message Date
Marc Paine
7ad7e5f37f
Merge pull request #14836 from joeloff/finalizer2 
Ensure finalizer only runs when no matching SDK feature bands are installed
 2022-11-03 15:51:28 -07:00
Marc Paine
15aec658a5
Merge branch 'release/6.0.4xx' into merge/release/6.0.3xx-to-release/6.0.4xx 2022-11-03 13:22:52 -07:00
Jason Zhai
f3f7fb6c5d Merge branch 'release/6.0.1xx' into release/6.0.3xx 2022-11-02 22:26:15 -07:00
Jacques Eloff
319ac0113e Ensure finalizer only runs when no matching SDK feature bands are installed 2022-10-26 21:24:13 -07:00
Marc Paine
306e6009b3
Fix to final 3.1 build 2022-10-25 10:58:48 -07:00
dotnet-maestro-bot
5b327454b9
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#14807) 
* Merged PR 25462: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk

This pull request updates the following dependencies

[marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698
- **Build**: 20220919.14
- **Date Produced**: September 19, 2022 7:24:58 PM UTC
- **Commit**: 020b4fda1c3cf81307d8f13689d63bb3c09c91a8
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.109-servicing.22421.3 to 6.0.110-servicing.22469.14][23]
  - **Microsoft.NET.Sdk**: [from 6.0.109-servicing.22421.3 to 6.0.110-servicing.22469.14][23]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.9 to 6.0.10][24]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.9-servicing.22420.3 to 6.0.10-servicing.22464.9][24]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.9-servicing.22420.3 to 6.0.10-servicing.22464.9][24]
  - **Microsoft.NETCore.App.Ref**: [from 6.0.9 to 6.0.10][25]
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.9-servicing.22419.5 to 6.0.10-servicing.22463.20][25]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.9 to 6.0.10][25]
  - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.9 to 6.0.10][25]
  - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.9 to 6.0.10][25]
  - **Microsoft.NETCore.Platforms**: [from 6.0.5 to 6.0.6][26]
  - **Microsoft.AspNetCore.App.Ref**: [from 6.0.9 to 6.0.10][27]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22464.7][27]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.9 to 6.0.10][27]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22464.7][27]
  - **dotnet-dev-certs**: [from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22464.7][27]
  - **dotnet-user-secrets**: [from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22464.7][27]
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.109 to 6.0.110][28]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.109-servicing.22420.11 to 6.0.110-servicing.22464.25][28]
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.109 to 6.0.110][28]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.9 to 6.0.10][24]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.9 to 6.0.10][24]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.9-servicing.22420.4 to 6.0.10-servicing.22456.13][29]
  - **Microsoft.Build**: [from 17.0.0 to 17.0.1][30]
  - **NuGet.Build.Tasks**: [from 6.0.2-rc.5 to 6.0.3-rc.1][31]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.9-servicing.22419.5 to 6.0.10-servicing.22463.20][25]

[23]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC7fffe6d&targetVersion=GC020b4fd&_a=files
[24]: https://dev.azure.com/dnceng/inte...

* Merged PR 26041: [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.10 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.10-servicing.22464.9 to 6.0.10-servicing.22470.9 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.10-servicing.22464.9 to 6.0.10-servicing.22470.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.10-servicing.22463.20 to 6.0.10-servicing.22469.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.Platforms**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.10-servicing.22464.7 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22464.7 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.10-servicing.22464.7 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.10-servicing.22464.7 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.110 to 6.0.110 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.110-servicing.22464.25 to 6.0.110-servicing.22470.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.110 to 6.0.110 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.9-servicing.22419.10 to 6.0.10-servicing.22470.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.10-servicing.22456...

* Merged PR 26213: [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.NETCore.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.10-servicing.22469.10 to 6.0.10-servicing.22476.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.Platforms**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.110 to 6.0.110 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.110-servicing.22470.2 to 6.0.110-servicing.22476.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.110 to 6.0.110 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22469.10 to 6.0.10-servicing.22476.5 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698
- **Build**: 20220926.22
- **Date Produced**: September 26, 2022 11:14:22 PM UTC
- **Commit**: 4041520e714b4334789706bde25e61ff91cf6c2b
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.110-servicing.22470.38 to 6.0.110-servicing.22476.22][1]
  - **Microsoft.NET.Sdk**: [from 6.0.110-servicing.22470.38 to 6.0.110-servicing.22476.22][1]
  - **Microsoft.NETCore.App.Ref**: [from 6.0.10 to 6.0.10][2]
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.10-servicing.22469.10 to 6.0.10-servicing.22476.5][2]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.10 to 6.0.10][2]
  - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.10 to 6.0.10][2]
  - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.10 to 6.0.10][2]
  - **Microsoft.NETCore.Platforms**: [from 6.0.6 to 6.0.6][2]
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.110 to 6.0.110][3]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.110-servicing.22470.2 to 6.0.110-servicing.22476.12][3]
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0*...

* Merged PR 26229: [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.AspNetCore.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.110 to 6.0.110 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.110-servicing.22476.12 to 6.0.110-servicing.22476.19 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.110 to 6.0.110 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698
- **Build**: 20220926.31
- **Date Produced**: September 27, 2022 1:37:52 AM UTC
- **Commit**: cb11e73629ffbf6eee418a40fc602ceb752794fa
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.110-servicing.22476.22 to 6.0.110-servicing.22476.31][1]
  - **Microsoft.NET.Sdk**: [from 6.0.110-servicing.22476.22 to 6.0.110-servicing.22476.31][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 6.0.10 to 6.0.10][2]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][2]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.10 to 6.0.10][2]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][2]
  - **dotnet-dev-certs**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][2]
  - **dotnet-user-secrets**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][2]
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.110 to 6.0.110][3]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.110-servicing.22476.12 to 6.0.110-servicing.2247...

* Merged PR 26243: [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.10 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.10-servicing.22470.9 to 6.0.10-servicing.22476.6 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.10-servicing.22470.9 to 6.0.10-servicing.22476.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.10-servicing.22470.3 to 6.0.10-servicing.22476.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.10-servicing.22470.7 to 6.0.10-servicing.22476.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698
- **Build**: 20220926.46
- **Date Produced**: September 27, 2022 3:39:36 AM UTC
- **Commit**: a886cd6214c92f6a5d955c056014820c35591e7b
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.110-servicing.22476.31 to 6.0.110-servicing.22476.46][1]
  - **Microsoft.NET.Sdk**: [from 6.0.110-servicing.22476.31 to 6.0.110-servicing.22476.46][1]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.10 to 6.0.10][2]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.10-...

* Update source-build tarball CI to utilize faster build agents (#14795)

Co-authored-by: dotnet-bot <dotnet-bot@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: Matt Mitchell <mmitche@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: Michael Simons <msimons@microsoft.com>
 2022-10-21 08:16:04 -05:00
v-wuzhai
476b7a7d11
Merge pull request #14803 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-20 23:16:12 -07:00
Michael Simons
5700aea798
Update source-build tarball CI to utilize faster build agents (#14795) 2022-10-20 08:18:44 -05: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
c058f55a7c
Merge branch 'release/6.0.4xx' into internal-merge-6.0.4xx-2022-10-11-1011 2022-10-13 13:47:08 -07:00
Marc Paine
216b75ce9c
Merge pull request #14742 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-10-12 15:30:16 -07: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
Jason Zhai
0d31263c5b Merge branch 'release/6.0.3xx' into release/6.0.4xx 2022-10-12 00:13:19 -07: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
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
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
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
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
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
dotnet-bot
f03135fff0 Merge in 'release/6.0.1xx' changes 2022-09-22 15:02:50 +00:00
Logan Bussell
8aec008f2e
Fix MS.Extensions versions in dotnet-format (#14566) 2022-09-21 21:54:18 -07:00
DotNet Bot
5736f0f20f Merged PR 25462: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk 
This pull request updates the following dependencies

[marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698
- **Build**: 20220919.14
- **Date Produced**: September 19, 2022 7:24:58 PM UTC
- **Commit**: 020b4fda1c3cf81307d8f13689d63bb3c09c91a8
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.109-servicing.22421.3 to 6.0.110-servicing.22469.14][23]
  - **Microsoft.NET.Sdk**: [from 6.0.109-servicing.22421.3 to 6.0.110-servicing.22469.14][23]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.9 to 6.0.10][24]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.9-servicing.22420.3 to 6.0.10-servicing.22464.9][24]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.9-servicing.22420.3 to 6.0.10-servicing.22464.9][24]
  - **Microsoft.NETCore.App.Ref**: [from 6.0.9 to 6.0.10][25]
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.9-servicing.22419.5 to 6.0.10-servicing.22463.20][25]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.9 to 6.0.10][25]
  - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.9 to 6.0.10][25]
  - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.9 to 6.0.10][25]
  - **Microsoft.NETCore.Platforms**: [from 6.0.5 to 6.0.6][26]
  - **Microsoft.AspNetCore.App.Ref**: [from 6.0.9 to 6.0.10][27]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22464.7][27]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.9 to 6.0.10][27]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22464.7][27]
  - **dotnet-dev-certs**: [from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22464.7][27]
  - **dotnet-user-secrets**: [from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22464.7][27]
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.109 to 6.0.110][28]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.109-servicing.22420.11 to 6.0.110-servicing.22464.25][28]
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.109 to 6.0.110][28]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.9 to 6.0.10][24]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.9 to 6.0.10][24]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.9-servicing.22420.4 to 6.0.10-servicing.22456.13][29]
  - **Microsoft.Build**: [from 17.0.0 to 17.0.1][30]
  - **NuGet.Build.Tasks**: [from 6.0.2-rc.5 to 6.0.3-rc.1][31]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.9-servicing.22419.5 to 6.0.10-servicing.22463.20][25]

[23]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC7fffe6d&targetVersion=GC020b4fd&_a=files
[24]: https://dev.azure.com/dnceng/inte...
 2022-09-20 15:12:44 +00:00
Matt Mitchell
b5f732e4b5
Merge pull request #14481 from vseanreesermsft/internal-merge-6.0.1xx-2022-09-13-1003 
Merging internal commits for release/6.0.1xx
 2022-09-14 14:38:45 -07:00
dotnet-bot
cfc0f130dc Merge in 'release/6.0.1xx' changes 2022-09-14 04:00:44 +00:00
NET Source-Build Bot
f9c278be33
.NET Source-Build 6.0.109 September 2022 Updates (#14482) 
* update global.json and Versions.props for .NET SDK 6.0.109

* Use re-uploaded SB artifacts tarball version

Co-authored-by: Logan Bussell <loganbussell@microsoft.com>
 2022-09-14 03:50:12 +00:00
Daniel Plaisted
af7672089f Merged PR 25723: use mktemp to correctly use temp files 
Apply https://dev.azure.com/dnceng/internal/_git/dotnet-installer/pullrequest/24828 to 6.0.4xx
 2022-09-13 22:09:00 +00:00
Sean Reeser
24feaa10a1 Merge commit '58a93139d80490d0724b4d862ba8ee00ceae45d3' into internal-merge-6.0.1xx-2022-09-13-1003 2022-09-13 10:03:50 -07:00
Sean Reeser
1fdee73365 Merge commit 'd61314894c0fdcdb6e9d9c9f1ff5f8a483570d33' into internal-merge-6.0.3xx-2022-09-13-1003 2022-09-13 10:03:41 -07:00
Sean Reeser
2115855cf9 Merge commit '0906eae6f8c72882c197e346b9125f0b69c4b3a7' into internal-merge-6.0.4xx-2022-09-13-1003 2022-09-13 10:03:32 -07:00
Antoine Martin
73436261e3
GetRuntimeInformation.targets: determine PortableProductMonikerRid based on OSName and Architecture. (backports #12516) 2022-09-13 09:20:55 -04:00
Noah Gilson
be85081b6f use mktemp to correctly use temp files 2022-09-12 21:35:42 -04:00
dotnet-bot
4f86da42de Merge in 'release/6.0.1xx' changes 2022-09-01 19:28:34 +00:00
dotnet-bot
78380c12c3 Merge in 'release/6.0.4xx' changes 2022-09-01 19:28:26 +00:00
Alex Perovich
95d55b351e Update public pool names 2022-08-31 17:18:01 -07:00
Alex Perovich
ddfb6a9e05 Update public pool names 2022-08-31 17:17:51 -07:00
Alex Perovich
e3842453dc Update public pool names 2022-08-31 17:17:42 -07:00
Joshua Larkin
6e464725db Update ManualVersions.props for upcoming Windows SDK projection 2022-08-17 20:21:00 +00:00
Joshua Larkin
22f69f6349 Update ManualVersions.props for upcoming Windows SDK projection 2022-08-17 20:18:07 +00:00
Joshua Larkin
9e5f0c4313 Update ManualVersions.props for upcoming Windows SDK projection 2022-08-16 14:51:28 -04:00
NET Source-Build Bot
f2498acf16
update global.json and Versions.props for .NET SDK 6.0.108 (#14291) 2022-08-09 23:05:31 +00: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
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
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
e2a0da3d8f Add the full nuget version into the .version file 2022-08-08 14:21:30 -07: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
e759aafdd0
Update delete files with questionable licenses logic (#14265) 2022-08-05 14:26:50 -05:00
Marc Paine
005dd2364d
Stop app host downloads for android 2022-08-05 12:04:17 -07: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
Marc Paine
cf729ea84f Fix the 6.0 WD template bundles to use the 6.0 templates. 2022-07-28 13:34:38 -07:00