Commit graph

3707 commits

Author SHA1 Message Date
Sarah Oslund
5b24650ff9 Removing unused UseBundledNETCoreAppPackageVersionAsDefaultNetCorePatchVersion property 2020-03-26 11:35:24 -07:00
Sarah Oslund
8cc89ea7e5 Adding automatic generation of DefaultRuntimeFrameworkVersions 2020-03-26 10:01:21 -07:00
Daniel Plaisted
a199c488d7 Merge upstream changes 2020-03-25 11:03:43 -07:00
William Li
ae8a1c85d2
Merge pull request #6906 from dsplaisted/merge-5.0-preview1-to-preview2
Merge 5.0 preview1 to preview2
2020-03-24 17:30:15 -07:00
msftbot[bot]
ba203165fd
Merge pull request #6795 from sfoslund/UpdatePatches
Updating to 2.1.17 patch version
2020-03-24 22:03:27 +00:00
Daniel Plaisted
bf9b02831b Merge 5.0.1xx-preview1 changes 2020-03-24 11:56:33 -07:00
Viktor Hofer
cfbb4fa36f
Revert "Update web templates for preview2 (#6860)" (#6902)
This reverts commit 0d8d4288ac.
2020-03-24 10:39:45 -07:00
Daniel Plaisted
8b76f8dc98
Merge pull request #6844 from brianrob/disable_partial_crossgen
Disable Partial Crossgen and Crossgen More Binaries
2020-03-23 13:55:33 -07:00
dotnet-maestro[bot]
02ee648fc6
[master] Update dependencies from dotnet/sdk (#6774)
* Update dependencies from https://github.com/dotnet/sdk build 20200311.2

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20161.2
- Microsoft.NET.Sdk - 5.0.100-preview.3.20161.2

* Update dependencies from https://github.com/dotnet/sdk build 20200311.4

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20161.4
- Microsoft.NET.Sdk - 5.0.100-preview.3.20161.4

* Update dependencies from https://github.com/dotnet/sdk build 20200311.6

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20161.6
- Microsoft.NET.Sdk - 5.0.100-preview.3.20161.6

* Update dependencies from https://github.com/dotnet/sdk build 20200311.7

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20161.7
- Microsoft.NET.Sdk - 5.0.100-preview.3.20161.7

* Update dependencies from https://github.com/dotnet/sdk build 20200312.1

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20162.1
- Microsoft.NET.Sdk - 5.0.100-preview.3.20162.1

* Update dependencies from https://github.com/dotnet/sdk build 20200312.2

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20162.2
- Microsoft.NET.Sdk - 5.0.100-preview.3.20162.2

* Update dependencies from https://github.com/dotnet/sdk build 20200312.3

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20162.3
- Microsoft.NET.Sdk - 5.0.100-preview.3.20162.3

* Update dependencies from https://github.com/dotnet/sdk build 20200312.5

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20162.5
- Microsoft.NET.Sdk - 5.0.100-preview.3.20162.5

* Update dependencies from https://github.com/dotnet/sdk build 20200312.7

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20162.7
- Microsoft.NET.Sdk - 5.0.100-preview.3.20162.7

* Update dependencies from https://github.com/dotnet/sdk build 20200312.9

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20162.9
- Microsoft.NET.Sdk - 5.0.100-preview.3.20162.9

* Update dependencies from https://github.com/dotnet/sdk build 20200313.1

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20163.1
- Microsoft.NET.Sdk - 5.0.100-preview.3.20163.1

* Update dependencies from https://github.com/dotnet/sdk build 20200313.2

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20163.2
- Microsoft.NET.Sdk - 5.0.100-preview.3.20163.2

* Update dependencies from https://github.com/dotnet/sdk build 20200313.3

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20163.3
- Microsoft.NET.Sdk - 5.0.100-preview.3.20163.3

* Update dependencies from https://github.com/dotnet/sdk build 20200315.1

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20165.1
- Microsoft.NET.Sdk - 5.0.100-preview.3.20165.1

* Update dependencies from https://github.com/dotnet/sdk build 20200315.3

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20165.3
- Microsoft.NET.Sdk - 5.0.100-preview.3.20165.3

* Update dependencies from https://github.com/dotnet/sdk build 20200317.2

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20167.2
- Microsoft.NET.Sdk - 5.0.100-preview.3.20167.2

* Update dependencies from https://github.com/dotnet/sdk build 20200317.3

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20167.3
- Microsoft.NET.Sdk - 5.0.100-preview.3.20167.3

* Update dependencies from https://github.com/dotnet/sdk build 20200317.5

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20167.5
- Microsoft.NET.Sdk - 5.0.100-preview.3.20167.5

* Update dependencies from https://github.com/dotnet/sdk build 20200317.8

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20167.8
- Microsoft.NET.Sdk - 5.0.100-preview.3.20167.8

* Update dependencies from https://github.com/dotnet/sdk build 20200318.1

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20168.1
- Microsoft.NET.Sdk - 5.0.100-preview.3.20168.1

* Update dependencies from https://github.com/dotnet/sdk build 20200318.2

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20168.2
- Microsoft.NET.Sdk - 5.0.100-preview.3.20168.2

* Update dependencies from https://github.com/dotnet/sdk build 20200318.6

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20168.6
- Microsoft.NET.Sdk - 5.0.100-preview.3.20168.6

* Update dependencies from https://github.com/dotnet/sdk build 20200318.7

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20168.7
- Microsoft.NET.Sdk - 5.0.100-preview.3.20168.7

* Update dependencies from https://github.com/dotnet/sdk build 20200318.8

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20168.8
- Microsoft.NET.Sdk - 5.0.100-preview.3.20168.8

* Update dependencies from https://github.com/dotnet/sdk build 20200318.9

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20168.9
- Microsoft.NET.Sdk - 5.0.100-preview.3.20168.9

* Update dependencies from https://github.com/dotnet/sdk build 20200318.10

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20168.10
- Microsoft.NET.Sdk - 5.0.100-preview.3.20168.10

* Update dependencies from https://github.com/dotnet/sdk build 20200319.1

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20169.1
- Microsoft.NET.Sdk - 5.0.100-preview.3.20169.1

* Update dependencies from https://github.com/dotnet/sdk build 20200319.2

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20169.2
- Microsoft.NET.Sdk - 5.0.100-preview.3.20169.2

* Update dependencies from https://github.com/dotnet/sdk build 20200319.3

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20169.3
- Microsoft.NET.Sdk - 5.0.100-preview.3.20169.3

* Update dependencies from https://github.com/dotnet/sdk build 20200319.4

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20169.4
- Microsoft.NET.Sdk - 5.0.100-preview.3.20169.4

* Update dependencies from https://github.com/dotnet/sdk build 20200320.1

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20170.1
- Microsoft.NET.Sdk - 5.0.100-preview.3.20170.1

* Partially reordered paths passed to crossgen

* Update dependencies from https://github.com/dotnet/sdk build 20200320.2

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20170.2
- Microsoft.NET.Sdk - 5.0.100-preview.3.20170.2

* Partially reordered paths passed to crossgen

* Partially reordered paths passed to crossgen

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Bekir Ozturk <bozturk@microsoft.com>
2020-03-20 21:42:20 +00:00
Viktor Hofer
0d8d4288ac
Update web templates for preview2 (#6860)
* Update web templates for preview2

Updating the web templates to a pinned version for preview2 until https://github.com/dotnet/aspnetcore/pull/19860 is resolved.
2020-03-19 09:52:31 +01:00
William Li
320e530464 Fix deb failure 2020-03-17 22:47:45 -07:00
sfoslund
e9f56dda48 Updating to 2.1.17 patch version 2020-03-17 15:56:20 -07:00
Brian Robbins
500ed50b31 Add more assemblies to the crossgen list. 2020-03-17 13:48:39 -07:00
Brian Robbins
ab98cad0e2 Specify -MissingDependenciesOK to crossgen. 2020-03-17 13:48:18 -07:00
Sarah Oslund
8ab3f42d20
Merge pull request #6836 from sfoslund/PortWinArm64
Adding support for win arm64 builds
2020-03-17 13:05:17 -07:00
Zbyněk Sailer (Moravia IT)
9e1f0e20a0 LOC CHECKIN | dotnet/core-sdk 5.0.1xx-preview1 | 20200317 2020-03-17 15:38:36 +01:00
Juan Hoyos
5b1ee5c1f5
[skip ci] Publish latest to preview2 specific channel 2020-03-16 13:45:51 -07:00
sfoslund
2deda3ae53 Adding support for win arm64 builds 2020-03-16 12:45:01 -07:00
sfoslund
d0b5a76c82 Updating to 2.1.17 patch version 2020-03-12 13:02:10 -07:00
Brian Robbins
e87acd73ac Disable partial NGEN. 2020-03-11 17:38:41 -07:00
sfoslund
2de8411fd3 Updating installer learn more links to 5.0 release notes 2020-03-11 14:45:36 -07:00
William Li
92129ee125
Merge pull request #6743 from NikolaMilosavljevic/osx.13
Update minimum supported OSX version to 10.13
2020-03-11 10:25:37 -07:00
Sarah Oslund
c0b921a789
Merge pull request #6753 from sfoslund/UpdateBundledVersions
Updating 3.1.x default runtime versions
2020-03-11 05:35:31 +08:00
Sarah Oslund
6f9a146a06
Merge pull request #6740 from sfoslund/WinArm64Build
Add Win-arm64 Leg
2020-03-11 01:32:00 +08:00
sfoslund
b1a65c534b Updating 3.1.x default runtime versions 2020-03-10 10:07:39 -07:00
Nikola Milosavljevic (CLR)
7321a05a35 Update minimum supported OSX version to 10.13 2020-03-09 13:17:14 -07:00
sfoslund
660fd7a768 Adding support for win arm64 builds 2020-03-06 15:51:55 -08:00
Matt Mitchell
7756948a8c Merge remote-tracking branch 'upstream/release/5.0.1xx-preview1' into merge-from-5.0 2020-03-05 11:11:30 -08:00
Matt Mitchell
1c44853056
Updating 3.1.x bundle versions (#6674) 2020-03-05 09:44:46 -08:00
Nick Guerrera
dd8802ee6d Fix toolset ingestion URL 2020-03-04 08:57:11 -08:00
William Li
94932e9f86
Add 5.0 templates (#6647) 2020-03-02 13:23:21 -08:00
Nick Guerrera
175ab37f20 Merge branch 'release/5.0.1xx-preview1' into merge-50p1 2020-02-28 14:27:38 -08:00
William Li
d46ee00032
Add 5.0 template (#6583)
* Add 5.0 templates to template/5.0 folder
2020-02-27 13:25:10 -08:00
Sarah Oslund
22192f3d37
Merge pull request #6558 from sfoslund/UpdateBranding
Updating installer branding
2020-02-27 12:49:22 -08:00
sfoslund
c5a1a3c006 Updating installation note with proper versions 2020-02-27 11:13:56 -08:00
Michael Simons
ef4011b55a
Update BranchInfo channel for release/5.0.1xx-preview1 branch (#6574) 2020-02-26 08:18:05 -08:00
Phil Henning
7ddc5746f3 Add 5.0 common project templates to Bundle. 2020-02-25 07:00:13 -08:00
sfoslund
c169c1c426 Updating installer branding 2020-02-24 15:34:30 -08:00
dotnet-maestro[bot]
664dc77bc1
[release/3.1.1xx] Update dependencies from dotnet/aspnetcore (#6506)
* Update dependencies from https://github.com/dotnet/aspnetcore build 20200220.11

- dotnet-watch - 3.1.3-servicing.20120.11
- dotnet-user-secrets - 3.1.3-servicing.20120.11
- dotnet-dev-certs - 3.1.3-servicing.20120.11
- Microsoft.AspNetCore.App.Ref - 3.1.3
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.3
- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.3-servicing.20120.11

Dependency coherency updates

- Microsoft.DotNet.MSBuildSdkResolver - 3.1.103-servicing.20120.3 (parent: Microsoft.Dotnet.Toolset.Internal)

* Update GenerateLayout.targets

Co-authored-by: William Godbe <wigodbe@microsoft.com>
2020-02-21 04:31:51 +00:00
Nick Guerrera
c6b041e78c Fix merge issues with templates 2020-02-19 15:43:20 -08:00
Nick Guerrera
03963a5788 Merge branch 'release/5.0.1xx-preview1' into merge/release/3.1.2xx-to-master 2020-02-19 13:50:39 -08:00
Daniel Plaisted
2a8f6d1b34 Update 2.1 implicit versions 2020-02-19 11:00:34 -08:00
Daniel Plaisted
113d03bcb5
Update branding to 3.1.103 2020-02-13 16:41:46 -08:00
Fadi Hanna
645fdc4bc6
Fix formatting bug for crossgen2's supported RIDs (#6302) 2020-02-06 13:01:19 -08:00
William Li
288bb5c8b6 Remove all reference to 21 template 2020-02-05 22:16:55 -08:00
William Godbe
6dc2944d31
Revert to 3.1.1 runtime (#6272)
* Revert to 3.1.1 runtime

* use 3.1.1 version of GenerateLayout.targets
2020-02-03 10:46:25 -08:00
Nick Guerrera
573d158fea
[3.1.1xx] Bump self-contained default for 3.0.x and 2.1.x (#6268)
* Bump self-contained default for 3.0.x and 2.1.x

* Add 3.0.3 feeds for tests
2020-01-30 16:18:56 -08:00
Fadi Hanna
63e9316a15
Add a KnownCrossgen2Pack entry for the crossgen2 compiler packages (#6227) 2020-01-30 16:16:07 -08:00
msftbot[bot]
2f3fb6ea5e
Merge pull request #6242 from wli3/fix-msi-gg
Fix msi non-deterministic ComponentId
2020-01-28 21:07:00 +00:00
William Li
3e8b475e2f Cap major 5 2020-01-28 12:35:25 -08:00
William Li
df09f07394 Finish ComponentID reset 2020-01-28 12:35:16 -08:00
William Li
fdda58e6ff Use nuget version to better reduce code 2020-01-28 12:35:09 -08:00
William Li
b76a641e4f Use Task to calculate template versions
No behaivor change
2020-01-28 12:35:01 -08:00
William Li
24ffef0659 Remove -gg in harvest 2020-01-28 12:34:51 -08:00
William Li
90b13626ab Cap major 5 2020-01-28 12:33:43 -08:00
William Li
8b9a67d117 Finish ComponentID reset 2020-01-25 17:33:21 -08:00
William Li
38ff5b6af1 Use nuget version to better reduce code 2020-01-25 17:15:10 -08:00
William Li
0806ef1bd1 Use Task to calculate template versions
No behaivor change
2020-01-25 16:40:47 -08:00
sfoslund
46b8ddf0b5 Reverting drop suffix change 2020-01-21 11:24:22 -08:00
Sarah Oslund
672d0ec1e2 Merge branch 'release/3.1.1xx' into Merging3.1And3.2 2020-01-21 08:40:01 -08:00
William Li
252416a21a Remove -gg in harvest 2020-01-19 08:53:28 -08:00
dotnet-maestro[bot]
56ce343ea2
[release/3.1.1xx] Update dependencies from dotnet/aspnetcore (#6162)
* Update dependencies from https://github.com/dotnet/aspnetcore build 20200116.1

- dotnet-user-secrets - 3.1.2-servicing.20066.1
- dotnet-watch - 3.1.2-servicing.20066.1
- Microsoft.AspNetCore.App.Ref - 3.1.2
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.2
- dotnet-dev-certs - 3.1.2-servicing.20066.1
- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.2-servicing.20066.1

* Update dependencies from https://github.com/dotnet/aspnetcore build 20200116.4

- dotnet-user-secrets - 3.1.2-servicing.20066.4
- dotnet-watch - 3.1.2-servicing.20066.4
- Microsoft.AspNetCore.App.Ref - 3.1.2
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.2
- dotnet-dev-certs - 3.1.2-servicing.20066.4
- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.2-servicing.20066.4

* Update dependencies from https://github.com/dotnet/aspnetcore build 20200116.14

- dotnet-user-secrets - 3.1.2-servicing.20066.14
- dotnet-watch - 3.1.2-servicing.20066.14
- Microsoft.AspNetCore.App.Ref - 3.1.2
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.2
- dotnet-dev-certs - 3.1.2-servicing.20066.14
- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.2-servicing.20066.14

* Update dependencies from https://github.com/dotnet/aspnetcore build 20200116.15

- dotnet-user-secrets - 3.1.2-servicing.20066.15
- dotnet-watch - 3.1.2-servicing.20066.15
- Microsoft.AspNetCore.App.Ref - 3.1.2
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.2
- dotnet-dev-certs - 3.1.2-servicing.20066.15
- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.2-servicing.20066.15

* Update dependencies from https://github.com/dotnet/aspnetcore build 20200117.1

- dotnet-user-secrets - 3.1.2-servicing.20067.1
- dotnet-watch - 3.1.2-servicing.20067.1
- Microsoft.AspNetCore.App.Ref - 3.1.2
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.2
- dotnet-dev-certs - 3.1.2-servicing.20067.1
- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.2-servicing.20067.1

* Update dependencies from https://github.com/dotnet/aspnetcore build 20200117.4

- dotnet-user-secrets - 3.1.2-servicing.20067.4
- dotnet-watch - 3.1.2-servicing.20067.4
- Microsoft.AspNetCore.App.Ref - 3.1.2
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.2
- dotnet-dev-certs - 3.1.2-servicing.20067.4
- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.2-servicing.20067.4

* Update dependencies from https://github.com/dotnet/aspnetcore build 20200118.1

- dotnet-dev-certs - 3.1.2-servicing.20068.1
- dotnet-user-secrets - 3.1.2-servicing.20068.1
- dotnet-watch - 3.1.2-servicing.20068.1
- Microsoft.AspNetCore.App.Ref - 3.1.2
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.2
- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.2-servicing.20068.1

* Update AspNetCoreTargetingPackBlobVersion to 3.1.2

* fixup AspNetCoreTargetingPackBlobVersion

* Use property

* don't use property

Co-authored-by: William Godbe <wigodbe@microsoft.com>
2020-01-18 21:31:47 +00:00
Sarah Oslund
cb71d005c1 Merge branch 'release/3.1.1xx' into release/3.1.2xx 2020-01-15 09:42:07 -08:00
Sarah Oslund
0a4f5e443d Merge branch 'release/3.1.2xx' 2020-01-15 09:23:07 -08:00
Daniel Plaisted
8131a95fc2 Bump branding to 3.1.102 2020-01-14 19:34:03 -08:00
Nick Guerrera
8d13410014 Bump 2.1.x implicit versions
Disable SDK tests that do 2.1.x self-contained

Delete GivenSelfContainedAppsRollForward. It doesn't work with 3.x+ already and won't work with 2.x MSRCs.
2020-01-14 17:45:28 -08:00
Livar Cunha
688644d44e Did a hack where we are writing the version to a file during build to be read during publish, as these are two separate builds by arcade and also passed the BuildNumberId so that the id is calculated properly during copy to latest. 2020-01-09 21:13:46 -08:00
Livar Cunha
befcc966a5 Moving the GitCommitHash code to a target to be shared amongst a couple of other targets. 2020-01-09 12:52:53 -08:00
Livar Cunha
ca6e86d472 Move GenerateFullNuGetVersion to a different target to be shared by build, publish and publish to latest. 2020-01-09 11:31:14 -08:00
William Li
2253434a97
Merge pull request #5931 from dotnet-maestro-bot/merge/release/3.1.1xx-to-release/3.1.2xx
[automated] Merge branch 'release/3.1.1xx' => 'release/3.1.2xx'
2020-01-08 15:05:45 -08:00
Livar Cunha
83679698f9 Updated all MSIs to use the GenerateMsiVersion task and also moved the generation of FullNuGetVersion to a target because it depends on things happening in BeforeCommons.targets of Arcade. 2020-01-03 15:49:06 -08:00
Livar Cunha
56c36dfd3a Fallback to commitcount for msi version when doing builds in CI or locally. For official builds it will use the patch number calculated by arcade. 2019-12-26 10:40:20 -08:00
Livar Cunha
34b644977c Use _PatchNumber from arcade instead of commit count. Fixes msi generation and changes VersionPatch to VersionFeature. 2019-12-23 15:18:07 -08:00
Livar Cunha
57dd97f02a Adding back commit count for msi calculation. I believe we will need to change that to avoid colisions. 2019-12-20 15:58:08 -08:00
Livar Cunha
72f288ab58 Switching from using commit height for versioning to using Arcade's scheme. 2019-12-20 13:19:56 -08:00
dotnet-bot
b377529961 Merge in 'release/3.1.1xx' changes 2019-12-19 21:58:17 +00:00
Nick Guerrera
7d2bade6ec
Use suffixed location for 3.1.0 TP download (#5930)
Use the suffixed location for the TP download.
Change back later.

Co-authored-by: Matt Mitchell <mmitche@microsoft.com>
2019-12-19 13:56:42 -08:00
William Li
d82cde6315 Fix merge 2019-12-17 21:37:59 -08:00
William Li
4e1ba631b8 Merge branch 'release/3.1.2xx' 2019-12-17 21:34:27 -08:00
Nick Guerrera
ac7c03ce2a Merged PR 4935: Bump 2.1.x and 3.0.x versions for SCD; use 3.1.0 for FDD 2019-12-17 01:05:32 +00:00
Matt Mitchell
a8cef816ed Stabilize package versions 2019-12-16 14:47:54 -08:00
Nick Guerrera
b925821a07 Bump to 3.0.2 for SCD; use 3.1.0 for SCD 2019-12-16 14:08:20 -08:00
DotNet Bot
e5837fa361 Merge pull request 4898 from darc-internal/release/3.1.1xx-1a8919d3-cda2-437b-9784-4b0111084702 into internal/release/3.1.1xx 2019-12-16 22:08:02 +00:00
Nick Guerrera
784091d577 Bump 2.1.x implicit versions
Disable SDK tests that do 2.1.x self-contained

Delete GivenSelfContainedAppsRollForward. It doesn't work with 3.x+ already and won't work with 2.x MSRCs.
2019-12-16 14:03:10 -08:00
mmitche
d78a7565b5 Merge remote-tracking branch 'upstream/release/3.1.1xx' into merge-from-311xx 2019-12-10 13:52:12 -08:00
Matt Mitchell
9060c20d14
Merge pull request #5830 from dotnet-maestro-bot/merge/release/3.1.1xx-to-release/3.1.2xx
[automated] Merge branch 'release/3.1.1xx' => 'release/3.1.2xx'
2019-12-10 08:32:37 -08:00
Matt Mitchell
e382ec542b
Fixup indentation 2019-12-09 08:11:52 -08:00
Matt Mitchell
40a92b5d67
Fixup version patch 2019-12-09 08:11:28 -08:00
Matt Mitchell
2b6bd1474e Merge remote-tracking branch 'upstream/release/3.0.1xx' into merge-from-release/3.0.1xx 2019-12-09 08:07:02 -08:00
Divino César
624ec5e7b3 Augment DownloadFile task to make it able to download from public/private location (#5414)
* Patch to DownloadFile: retries + only use PrivateUri on 404 errors.

* Refactor PrivateURL in GenerateLayout.targets

* Address PR feedback.

* Addressing PR feedback.

* PR feedback

* PR feedback. Bug fix.

* Removing test related typo

* Fixup blob replacement

* Fixup blob replacement

* Broaden usage of read sas token to include PRs
2019-12-07 15:05:24 -08:00
William Godbe
a3c1db033e
Pin dependency on Core-Setup ref packs to 3.1.0 (#5814)
* Pin dependency on Core-Setup ref packs to 3.1.0

* Fixup core-setup feeds

* Move pinned deps later in file

* Update GenerateLayout to account for pinned packs
2019-12-06 14:56:33 -08:00
Nick Guerrera
41d020cd32 Merge branch 'master' into merge/release/3.1.2xx-to-master 2019-12-05 15:48:22 -08:00
William Li
5b489d6169
Update branching to "preview" 2019-12-05 11:14:53 -08:00
William Li
036e7afaff update branding 3.1.101 servicing 2019-11-22 13:29:45 -08:00
Matt Mitchell
7b0f60d871
[release/3.0.1xx] Update branding for 3.0.102 (#5725) 2019-11-22 11:25:16 -08:00
William Li
9018671d62
Set DropSuffix=false (#5737) 2019-11-21 11:22:15 -08:00
William Li
fc3c44a49c Update branding to 3.1.200 preview1 2019-11-21 10:23:59 -08:00
Nick Guerrera
4b50b4ac40 Bump 3.0 packs to 3.0.1 as appropriate (#5698) 2019-11-16 15:38:55 -08:00
William Godbe
9f6349b659
Update PreReleaseVersionLabel to RTM (#5671) 2019-11-15 12:50:53 -08:00
Daniel Plaisted
46cb5e7523 Stabilize package versions (#5587) 2019-11-13 11:49:49 -08:00