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

22470 commits

This branch
This branch
All branches
Author SHA1 Message Date
dotnet-bot
94d5ff8aad Merge in 'release/6.0.1xx' changes 2022-01-14 20:38:04 +00:00
dotnet-maestro[bot]
d31aa165db
Update dependencies from https://github.com/dotnet/test-templates build 20220114.3 (#13051) 
[release/6.0.1xx] Update dependencies from dotnet/test-templates
 2022-01-14 20:37:03 +00:00
dotnet-bot
a924edeea1 Merge in 'release/6.0.1xx' changes 2022-01-14 06:42:24 +00:00
Marc Paine
ad30dae28e
Merge pull request #13035 from dotnet/marcpopMSFT-downgrade31implicitversion601 
Update GenerateBundledVersions.targets
 2022-01-13 22:41:09 -08:00
Marc Paine
6f0f80e3aa
Update GenerateBundledVersions.targets 2022-01-13 14:08:42 -08:00
Matt Mitchell
b6928a1799 Merge remote-tracking branch 'upstream/release/6.0.1xx' into internal/release/6.0.1xx 2022-01-13 10:38:55 -08:00
dotnet-maestro[bot]
fbda78a567
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220113.1 (#13025) 
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
 2022-01-13 15:49:17 +00:00
dotnet-maestro[bot]
351dbd3ecc
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220111.1 (#13007) 
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
 2022-01-12 03:18:18 +00:00
Daniel Plaisted
0d3f10e495
Merge pull request #12987 from dsplaisted/fix-installertype-location 
Fix installertype path for patches
 2022-01-10 16:58:14 -08:00
Daniel Plaisted
b00ba9b79e Fix installertype path for patches 2022-01-06 17:46:04 -08:00
Daniel Plaisted
11ef768a80
Merge pull request #12854 from dotnet/darc-release/6.0.1xx-a59ff264-9e12-4389-b3b3-55eb38bbccd8 
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
 2021-12-29 10:48:03 -08:00
dotnet-bot
4e8f0d528a Merge in 'release/6.0.1xx' changes 2021-12-17 20:31:41 +00:00
Michael Simons
f14e400349
Exclude omnisharp tests from CentOS 7 CI (#12858) 
* Exclude omnisharp tests from CentOS 7 CI

* Update src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml

Co-authored-by: Chris Rummel <crummel@microsoft.com>

Co-authored-by: Chris Rummel <crummel@microsoft.com>
 2021-12-17 14:30:05 -06:00
dotnet-bot
66b270fe0e Merge in 'release/6.0.1xx' changes 2021-12-17 00:46:32 +00:00
Michael Simons
586476f7e5
Add logic to convert internal repo uris in version.details.xml (#12852) 
* Add logic to convert internal repo uris in version.details.xml

* code review updates
 2021-12-16 18:45:17 -06:00
dotnet-maestro[bot]
f67f24dc20 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211216.1 
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 7.0.0-alpha.1.21614.3 -> To Version 6.0.0-alpha.1.21616.1
 2021-12-16 15:16:48 +00:00
dotnet-bot
bcb56e4ea7 Merge in 'release/6.0.1xx' changes 2021-12-16 00:22:38 +00:00
Matt Mitchell
f58d51e6ae
Merging internal commits for release/6.0.1xx (#12827) 
* Support source-build tarball creation w/internal repos

* Merged PR 19846: [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.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.0-rtm.21523.1 to 6.0.0-rtm.21567.8 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.0-rtm.21523.1 to 6.0.0-rtm.21567.8 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 6.0.0 to 6.0.1 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.0-rtm.21522.10 to 6.0.1-servicing.21567.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.0 to 6.0.1 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.0 to 6.0.1 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.0 to 6.0.1 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.Platforms**: from 6.0.0 to 6.0.1 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.0 to 6.0.1 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.0-rtm.21526.8 to 6.0.1-servicing.21567.14 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.0-rtm.21526.8 to 6.0.1-servicing.21567.14 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.0-rtm.21526.8 to 6.0.1-servicing.21567.14 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.0-rtm.21523.1 to 6.0.1-servicing.21567.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.0-rtm.21523.1 to 6.0.1-servicing.21567.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.0-rtm.21522.10 to 6.0.1-servicing.21567.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**: 20211115.9
- **Date Produced**: November 15, 2021 7:50:53 PM UTC
- **Commit**: 7aff324297b3853a1cb198f92ec20f6bae9e2de5
- **Branch**: r...

* Merged PR 19997: [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.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.0-rtm.21567.8 to 6.0.1-servicing.21568.2 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.0-rtm.21567.8 to 6.0.0-rtm.21523.1 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.0 to 6.0.1 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.0 to 6.0.1 (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**: 20211118.7
- **Date Produced**: November 18, 2021 8:11:25 PM UTC
- **Commit**: a35d9cf17ada1a09791d4f5e2b61e0a33bfb9475
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.NET.Sdk**: [from 6.0.101-servicing.21567.27 to 6.0.101-servicing.21568.7][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.101-servicing.21567.27 to 6.0.101-servicing.21568.7][1]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.0 to 6.0.0][2]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.0-rtm.21567.8 to 6.0.1-servicing.21568.2][3]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.0-rtm.21567.8 to 6.0.0-rtm.21523.1][2]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.0 to 6.0.1][3]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.0 to 6.0.1][3]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC0de2b2e&targetVersion=GCa35d9cf&_a=files
[2]: ac655f0...59fea7d
[3]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GCac655f0&targetVersion=GCef15b55&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698)

* Merged PR 20001: [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.Net.Compilers.Toolset**: from 4.0.0-6.21526.21 to 4.0.1-1.21568.1 (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**: 20211118.11
- **Date Produced**: November 18, 2021 10:53:09 PM UTC
- **Commit**: 95eaa4de1bbaafa9a1d95c913b1ef80138a9a34f
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.NET.Sdk**: [from 6.0.101-servicing.21568.7 to 6.0.101-servicing.21568.11][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.101-servicing.21568.7 to 6.0.101-servicing.21568.11][1]
  - **Microsoft.Net.Compilers.Toolset**: [from 4.0.0-6.21526.21 to 4.0.1-1.21568.1][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCa35d9cf&targetVersion=GC95eaa4d&_a=files
[2]: c7d6f9f...6ab6601

[DependencyUpdate]: <> (End)

[marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698)

* [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk
- Coherency Updates:
  - Microsoft.Net.Compilers.Toolset: from 4.0.1-1.21568.1 to 4.0.1-1.21569.2 (parent: Microsoft.NET.Sdk)

Co-authored-by: MichaelSimons <msimons@microsoft.com>
Co-authored-by: DotNet Bot <dn-bot@microsoft.com>
Co-authored-by: dotnet-bot <dotnet-bot@microsoft.com>
 2021-12-15 16:21:31 -08:00
DotNet Bot
a6432496b0 [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk 2021-12-15 02:42:14 +00:00
dotnet-bot
a36f8d0a67 Merge in 'release/6.0.1xx' changes 2021-12-15 01:24:24 +00:00
Michael Simons
1b7269474c
Update build logic to handle checked in project.assets.json file in NuGet repo (#12810) 2021-12-14 19:23:41 -06:00
Michael Simons
0c8aa6d7a9
Clean prebuilt baseline (#12816) 
* Remove prebuilt baseline

* Make prebuilt baseline file optional
 2021-12-14 19:23:15 -06:00
dotnet-bot
daa5587a85 Merge in 'release/6.0.1xx' changes 2021-12-15 00:04:12 +00:00
dotnet-maestro[bot]
24110c35db
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211214.3 (#12845) 
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
 2021-12-15 00:02:06 +00:00
dotnet-bot
16b964c975 Merge in 'release/6.0.1xx' changes 2021-12-14 23:23:33 +00:00
William Godbe
9b9ab15577
Update asp.net template versions (#12764) 2021-12-14 23:22:30 +00:00
dotnet-bot
8df33494b1 Merge in 'release/6.0.1xx' changes 2021-12-14 22:35:54 +00:00
dotnet-maestro[bot]
cad6ba8de3
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211214.1 (#12842) 
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
 2021-12-14 22:34:55 +00:00
dotnet-bot
bd2c4ef3db Merge in 'release/6.0.1xx' changes 2021-12-14 22:30:35 +00:00
Omair Majid
4e9a0b6434
[release/6.0.1xx] Add some additional distros to the CI matrix (#12141) 2021-12-14 16:29:29 -06:00
dotnet-bot
fd122a4e52 Merge in 'release/6.0.1xx' changes 2021-12-14 19:56:36 +00:00
dotnet-maestro[bot]
4de9f12e2e
Update dependencies from https://github.com/dotnet/arcade build 20211209.4 (#12837) 
[release/6.0.1xx] Update dependencies from dotnet/arcade
 2021-12-14 19:55:22 +00:00
Sean Reeser
2c5af44dde Merge commit 'ef49f6213a0256d5e8b10d9a573f8dd355bc8593' into internal-merge-6.0.1xx-2021-12-14-0946 2021-12-14 09:46:54 -08:00
DotNet Bot
e88edad0ea [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk 2021-12-14 08:43:37 +00:00
dotnet-bot
ef5a467861 Merge in 'release/6.0.1xx' changes 2021-12-13 18:42:36 +00:00
dotnet-maestro[bot]
5e966fbff4
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211213.1 (#12812) 
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
 2021-12-13 18:40:48 +00:00
DotNet Bot
c8a4f55c85 [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk 2021-12-11 01:53:10 +00:00
Marc Paine
9979d00dd5 Fix the logic that generates the fallback text file 2021-12-10 10:10:05 -08:00
dotnet-bot
ab1002a48a Merge in 'release/6.0.1xx' changes 2021-12-09 19:38:35 +00:00
Dan Seefeldt
65bbb444f8
Remove un-needed version properties (#12683) 2021-12-09 13:37:17 -06:00
dotnet-bot
f7c54abd06 Merge in 'release/6.0.1xx' changes 2021-12-08 18:58:35 +00:00
Daniel Plaisted
dca53077da
Merge pull request #12773 from MichaelSimons/issue-12673 
Refactor build status section to expose public builds
 2021-12-08 10:56:03 -08:00
dotnet-bot
3c6e939586 Merge in 'release/6.0.1xx' changes 2021-12-08 17:32:31 +00:00
dotnet-maestro[bot]
d7fe077c1b
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211208.1 (#12771) 
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
 2021-12-08 17:31:24 +00:00
Michael Simons
83418957c1 Refactor build status section to expose public builds 2021-12-08 11:27:56 -06:00
dotnet-bot
fb077b968e Merge in 'release/6.0.1xx' changes 2021-12-07 23:09:39 +00:00
dotnet-maestro[bot]
974ce5fc15
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211207.8 (#12770) 
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
 2021-12-07 23:07:23 +00:00
dotnet-bot
2b3f0a74dd Merge in 'release/6.0.1xx' changes 2021-12-07 21:40:29 +00:00
dotnet-maestro[bot]
d3d3005612
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211207.3 (#12768) 
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
 2021-12-07 21:39:04 +00:00
dotnet-bot
049b07e5c0 Merge in 'release/6.0.1xx' changes 2021-12-07 19:32:17 +00:00