Commit graph

18684 commits

Author SHA1 Message Date
Marc Paine
e425b1dca0 We were incorrectly includes .net core files and targets in the VS swr file. 2021-03-30 10:24:17 -07:00
Sarah Oslund
95496651f8
Merge pull request #9987 from j0shuams/patch-2
Update Windows SDK projection
2021-03-17 15:25:55 -07:00
Joshua Larkin
374dc98bd7
Update ManualVersions.props 2021-03-17 12:45:17 -07:00
William Godbe
0c8356304d
Update Aspnetcore 2.1 & 3.1 template versions (#9820) 2021-03-11 09:26:52 -08:00
William Godbe
2f52e6d10c
Merge pull request #9904 from dotnet/502xxMerge
Merge internal changes for 5.0.2xx
2021-03-11 09:20:31 -08:00
Sarah Oslund
3a2f084b9b Removing internal feeds 2021-03-10 11:47:01 -08:00
dotnet-maestro[bot]
9e521f7bf1
Update dependencies from https://github.com/dotnet/arcade build 20210309.7 (#9910)
[release/5.0.2xx] Update dependencies from dotnet/arcade
2021-03-10 19:09:26 +00:00
Sarah Oslund
35bb08b32f Merge commit 'a09bd5c' into HEAD 2021-03-10 11:08:22 -08:00
dotnet-maestro[bot]
3e424c4d76
Update dependencies from https://github.com/dotnet/arcade build 20210309.2 (#9897)
[release/5.0.2xx] Update dependencies from dotnet/arcade
2021-03-10 07:06:21 +00:00
William Li
0351671b07
Merge pull request #9798 from dotnet/marcpopMSFT-branding-202
Update branding for 5.0.2xx 5.0.2xx
2021-03-05 15:37:54 -08:00
William Li
beafdfb942 Update implicit versions
Disable and fix tests do not work with non-existent
LastRuntimeFrameworkVersion
2021-03-05 14:40:11 -08:00
Marc Paine
cea92349d3 Update branding for 5.0.2xx 5.0.2xx 2021-02-25 11:30:48 -08:00
DotNet Bot
a09bd5c86c Merged PR 13169: [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies

[marker]: <> (Begin:fec1f9ef-909e-4396-5b7d-08d8d784082a)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: fec1f9ef-909e-4396-5b7d-08d8d784082a
- **Build**: 20210223.24
- **Date Produced**: 2/24/2021 1:54 AM
- **Commit**: 51ff67bd457ca07bab44409a3f58b9bb68997f2f
- **Branch**: refs/heads/internal/release/5.0.2xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 5.0.201-servicing.21123.23 to 5.0.201-servicing.21123.24][1]
  - **Microsoft.NET.Sdk**: [from 5.0.201-servicing.21123.23 to 5.0.201-servicing.21123.24][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC51ff67b&targetVersion=GC51ff67b&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:fec1f9ef-909e-4396-5b7d-08d8d784082a)

[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**: from 5.0.4-servicing.21117.6 to 5.0.4-servicing.21117.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Net.Compilers.Toolset**: from 3.9.0-5.21120.8 to 3.9.0-6.21123.28 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)
2021-02-24 03:30:46 +00:00
DotNet-Bot
04de76ed9f Dependency coherency updates
Microsoft.WindowsDesktop.App,Microsoft.Net.Compilers.Toolset
 From Version 5.0.4-servicing.21117.6 -> To Version 5.0.4-servicing.21117.9 (parent: Microsoft.NET.Sdk
2021-02-24 02:37:27 +00:00
DotNet-Bot
1fec136e53 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20210223.24
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 5.0.201-servicing.21123.23 -> To Version 5.0.201-servicing.21123.24
2021-02-24 02:37:20 +00:00
DotNet-Bot
f029120276 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20210223.23
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 5.0.201-servicing.21123.16 -> To Version 5.0.201-servicing.21123.23
2021-02-24 02:37:12 +00:00
DotNet Bot
2c17870a09 Merged PR 13164: [internal/release/5.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**: from 5.0.3-servicing.21073.2 to 5.0.4-servicing.21117.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Internal**: from 5.0.3-servicing.21072.12 to 5.0.4-servicing.21116.14 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 5.0.3 to 5.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 5.0.3 to 5.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 5.0.3 to 5.0.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0**: from 5.0.3-servicing.21073.3 to 5.0.4-servicing.21118.15 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 5.0.3 to 5.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.EntityFrameworkCore**: from 5.0.3 to 5.0.4 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - **dotnet-dev-certs**: from 5.0.3-servicing.21073.3 to 5.0.4-servicing.21118.15 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 5.0.3-servicing.21073.3 to 5.0.4-servicing.21118.15 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 5.0.3 to 5.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 5.0.3-servicing.21073.2 to 5.0.4-servicing.21117.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 5.0.3 to 5.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 5.0.3-servicing.21073.2 to 5.0.4-servicing.21117.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:fec1f9ef-909e-4396-5b7d-08d8d784082a)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: fec1f9ef-909e-4396-5b7d-08d8d784082a
- **Build**: 20210223.16
- **Date Produced**: 2/23/2021 10:47 PM
- **Commit**: eb87e99879e0d4f697c33b6d991af832d4345a06
- **Branch**: refs/heads/internal/release/5.0.2xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 5.0.200-servicing.21123.3 to 5.0.201-servicing.21123.16][1]
  - **Microsoft.NET.Sdk**: [from 5.0.200-servicing.21123.3 to 5.0.201-servicing.21123.16][1]
  - **Microsoft.WindowsDesktop.App**: [from 5.0.3-servicing.21073.2 to 5.0.4-servicing.21117.6][2]
  - **Microsoft.NETCore.App.Internal**: [from 5.0.3-servici...
2021-02-24 02:33:30 +00:00
William Li
d26f0db082 Update implicit versions
Disable and fix tests do not work with non-existent
LastRuntimeFrameworkVersion
2021-02-23 17:37:37 -08:00
Matt Mitchell
95ef7ddfd3 Use VS redist targeting pack version for blob location 2021-02-23 17:12:42 -08:00
Matt Mitchell
c64c312424 Fixup nuget.config 2021-02-23 16:45:03 -08:00
Matt Mitchell
23f416f8de Cherry-pick internal runtime download change 2021-02-23 16:43:00 -08:00
Matt Mitchell
38fc6a8642 Cherry-pick internal runtime download change 2021-02-23 16:27:49 -08:00
DotNet-Bot
8db26e114b Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20210223.16
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 5.0.200-servicing.21123.3 -> To Version 5.0.201-servicing.21123.16

Dependency coherency updates

Microsoft.WindowsDesktop.App,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0,Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.EntityFrameworkCore,dotnet-dev-certs,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates
 From Version 5.0.3-servicing.21073.2 -> To Version 5.0.4-servicing.21117.6 (parent: Microsoft.NET.Sdk
2021-02-23 22:57:43 +00:00
Matt Mitchell
b5c628e773 Update branding to 5.0.201 2021-02-23 13:50:18 -08:00
dotnet-maestro[bot]
887809fbf3
Update dependencies from https://github.com/dotnet/sdk build 20210223.3 (#9779)
[release/5.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.NET.Test.Sdk: from 16.9.0-release-20210216-04 to 16.9.1 (parent: Microsoft.NET.Sdk)
2021-02-23 15:04:13 +00:00
William Li
70b3e65d53
Merge pull request #9778 from dotnet/Use-stable-verison
Update Versions.props
2021-02-21 13:35:52 -08:00
William Li
2e22c92fbd
Update Versions.props 2021-02-21 11:46:15 -08:00
dotnet-maestro[bot]
930412ccb0
Update dependencies from https://github.com/dotnet/sdk build 20210220.4 (#9777)
[release/5.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Net.Compilers.Toolset: from 3.9.0-5.21118.46 to 3.9.0-5.21120.8 (parent: Microsoft.NET.Sdk)
2021-02-20 20:43:18 +00:00
dotnet-maestro[bot]
72a1560674
Update dependencies from https://github.com/dotnet/sdk build 20210218.32 (#9763)
[release/5.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Net.Compilers.Toolset: from 3.9.0-5.21117.38 to 3.9.0-5.21118.46 (parent: Microsoft.NET.Sdk)
2021-02-20 03:20:40 +00:00
dotnet-maestro[bot]
131ba21cbe
Update dependencies from https://github.com/dotnet/sdk build 20210218.3 (#9748)
[release/5.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - NuGet.Build.Tasks: from 5.9.0-rc.7121 to 5.9.0-rc.7122 (parent: Microsoft.NET.Sdk)
2021-02-18 10:21:13 +00:00
dotnet-maestro[bot]
a31a45c2e7
Update dependencies from https://github.com/dotnet/sdk build 20210217.34 (#9744)
[release/5.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Net.Compilers.Toolset: from 3.9.0-5.21117.36 to 3.9.0-5.21117.38 (parent: Microsoft.NET.Sdk)
2021-02-18 06:51:47 +00:00
dotnet-maestro[bot]
3a7f171443
Update dependencies from https://github.com/dotnet/sdk build 20210217.30 (#9743)
[release/5.0.2xx] Update dependencies from dotnet/sdk
2021-02-18 05:03:16 +00:00
dotnet-maestro[bot]
5767330bf6
Update dependencies from https://github.com/dotnet/sdk build 20210217.28 (#9742)
[release/5.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Net.Compilers.Toolset: from 3.9.0-5.21116.10 to 3.9.0-5.21117.36 (parent: Microsoft.NET.Sdk)
2021-02-18 03:53:36 +00:00
William Li
500cb6f2c9
Merge pull request #9738 from manodasanW/patch-1
Update Windows SDK projection
2021-02-17 16:47:09 -08:00
dotnet-maestro[bot]
e146fe631a
[release/5.0.2xx] Update dependencies from dotnet/sdk (#9737)
[release/5.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Net.Compilers.Toolset: from 3.9.0-5.21112.20 to 3.9.0-5.21116.10 (parent: Microsoft.NET.Sdk)
2021-02-17 23:34:30 +00:00
Manodasan Wignarajah
808d111fd2
Update Windows SDK projection 2021-02-17 14:31:27 -08:00
William Li
1032d34e8f
Merge pull request #9736 from wli3/update-branding
Update branding and implicit version
2021-02-17 10:22:56 -08:00
William Li
ad7e175e66 aspnet targeting pack does not move every release 2021-02-17 09:12:52 -08:00
dotnet-maestro[bot]
1471ad8f9a
Update dependencies from https://github.com/dotnet/sdk build 20210216.9 (#9734)
[release/5.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.NET.Test.Sdk: from 16.9.0-release-20210209-03 to 16.9.0-release-20210216-04 (parent: Microsoft.NET.Sdk)
2021-02-17 08:33:38 +00:00
Marc Paine
ac4b7d95d9 Automatically calculate the implicit version number based on the current version. This will need to be updated any time 2.1 or 3.1 don't ship. 2021-02-16 14:22:17 -08:00
William Li
6b6e01d652 Update branding to servicing 2021-02-16 14:12:36 -08:00
Michelle McDaniel
533a174fe0
Duplicate productVersion.txt with repo-specific name (#9666) (#9709)
In our efforts to unify the build access story using aka.ms links, we have found that there are certain files that share the same name in multiple different repositories, most importantly, productVersion.txt. As part of the work to move to aka.ms links, we will be flattening the short link paths, so rather than having a runtime-specific, aspnetcore-specific, etc. full path to the files generated by each of the repos, they will all go to the same short link location. This means that the path to productVersion.txt will collide in the aka.ms links (the backing locations are not changing and will be unaffected). To combat this, we will add a duplicate of each of the product repos productVersion.txt, renamed to indicate which product repo it came from, in this case installer-productVersion.txt. The original will remane so that we do not break existing scenarios that do not use the aka.ms links.
2021-02-16 09:22:48 -08:00
dotnet-maestro[bot]
ceb2977a74
Update dependencies from https://github.com/dotnet/sdk build 20210216.2 (#9733)
[release/5.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - NuGet.Build.Tasks: from 5.9.0-rc.7097 to 5.9.0-rc.7121 (parent: Microsoft.NET.Sdk)
2021-02-16 10:27:40 +00:00
dotnet-maestro[bot]
98a9b7f4ee
Update dependencies from https://github.com/dotnet/sdk build 20210215.11 (#9732)
[release/5.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Build: from 16.9.0 to 16.9.0 (parent: Microsoft.NET.Sdk)
2021-02-15 21:08:06 +00:00
dotnet-maestro[bot]
2157b6d16f
Update dependencies from https://github.com/dotnet/sdk build 20210212.23 (#9723)
[release/5.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Net.Compilers.Toolset: from 3.9.0-5.21112.8 to 3.9.0-5.21112.20 (parent: Microsoft.NET.Sdk)
2021-02-13 01:53:48 +00:00
dotnet-maestro[bot]
b16002eb88
Update dependencies from https://github.com/dotnet/sdk build 20210212.21 (#9722)
[release/5.0.2xx] Update dependencies from dotnet/sdk
2021-02-13 01:07:47 +00:00
dotnet-maestro[bot]
d190d386bb
Update dependencies from https://github.com/dotnet/arcade build 20210212.3 (#9720)
[release/5.0.2xx] Update dependencies from dotnet/arcade
2021-02-12 21:50:03 +00:00
dotnet-maestro[bot]
c9ef6841c9
Update dependencies from https://github.com/dotnet/sdk build 20210212.11 (#9717)
[release/5.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Net.Compilers.Toolset: from 3.9.0-5.21111.10 to 3.9.0-5.21112.8 (parent: Microsoft.NET.Sdk)
2021-02-12 21:08:37 +00:00
dotnet-maestro[bot]
48a68472d9
Update dependencies from https://github.com/dotnet/sdk build 20210212.6 (#9714)
[release/5.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App: from 5.0.2-servicing.20613.4 to 5.0.3-servicing.21073.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Internal: from 5.0.2-servicing.20611.20 to 5.0.3-servicing.21072.12 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.2 to 5.0.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 5.0.2 to 5.0.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 5.0.2 to 5.0.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 5.0.0 to 5.0.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0: from 5.0.2-servicing.20613.2 to 5.0.3-servicing.21073.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.2 to 5.0.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.EntityFrameworkCore: from 5.0.2 to 5.0.3 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - dotnet-dev-certs: from 5.0.2-servicing.20613.2 to 5.0.3-servicing.21073.3 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 5.0.2-servicing.20613.2 to 5.0.3-servicing.21073.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.2 to 5.0.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.2-servicing.20613.1 to 5.0.3-servicing.21073.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.2 to 5.0.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.2-servicing.20613.2 to 5.0.3-servicing.21073.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
2021-02-12 17:42:31 +00:00
dotnet-maestro[bot]
6f7341bf20
Update dependencies from https://github.com/dotnet/sdk build 20210210.34 (#9703)
[release/5.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Net.Compilers.Toolset: from 3.9.0-4.21104.8 to 3.9.0-5.21111.10 (parent: Microsoft.NET.Sdk)
2021-02-11 08:33:14 +00:00