Jacques Eloff
95a8272668
Update WiX to 3.14.0.5722 ( #12252 )
2021-10-06 07:01:07 -07:00
Eric StJohn
dad4407de3
Use WIX_NATIVE_MACHINE to detect native architecture of target machine
2021-10-06 07:01:07 -07:00
Sarah Oslund
1a39c5ae6e
Merge pull request #12224 from sfoslund/MergeRc2ToMain
...
Merge 6.0.1xx-rc2 to main
2021-10-05 09:08:10 -07:00
sfoslund
f733b1efa8
Revert bundled templates change
2021-10-01 13:33:13 -07:00
sfoslund
423c4b45c2
Update wix version
2021-10-01 13:24:29 -07:00
sfoslund
569615ad4e
Merge branch 'MergeRc2ToMain' of https://github.com/sfoslund/core-sdk into MergeRc2ToMain
2021-10-01 12:55:46 -07:00
sfoslund
021cc71d58
Revert versions changes
2021-10-01 12:55:25 -07:00
MichaelSimons
ad7094b0db
Fix source-build merge conflicts
2021-10-01 19:21:21 +00:00
MichaelSimons
2f7c1a94d6
Disable offline source-build tarball CI
2021-10-01 18:36:48 +00:00
MichaelSimons
1af6f563f1
Correcting source-build related merge issues
2021-10-01 18:35:43 +00:00
sfoslund
a0c327cc2b
Merge remote-tracking branch 'upstream/release/6.0.1xx-rc2' into MergeRc2ToMain
2021-10-01 11:29:26 -07:00
Michael Simons
18c7fa28d1
Update Docker image used in CI to fix cert issue ( #12226 )
2021-10-01 13:26:11 -05:00
Sarah Oslund
cef94cb9e0
Merge remote-tracking branch 'upstream/release/6.0.1xx-rc2' into HEAD
2021-10-01 09:18:12 -07:00
Marc Paine
1a3a3f9950
Merge pull request #12218 from dseefeld/udpateSBRP
...
Update dependency from dotnet/source-build-reference-packages
2021-09-30 15:28:55 -07:00
Marc Paine
56b47dce2c
Merge pull request #12214 from dotnet/darc-main-5a34bbf8-6c8b-484c-b28e-e6314dde0079
...
[main] Update dependencies from dotnet/sdk
2021-09-30 15:27:34 -07:00
Marc Paine
0b61a78c5e
Merge pull request #12215 from jonathanpeppers/maui-preview-9
...
Update Maui/Xamarin manifests for .NET 6 RC 2
2021-09-30 15:27:07 -07:00
dseefeld
4eef63c43c
Update dependency from dotnet/source-build-reference-packages
2021-09-30 19:39:24 +00:00
dotnet-maestro[bot]
65d8358f9d
Dependency coherency updates
...
VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.Build
From Version 7.0.0-alpha.1.21479.1 -> To Version 7.0.0-alpha.1.21480.1 (parent: Microsoft.NET.Sdk
2021-09-30 17:07:34 +00:00
dotnet-maestro[bot]
35866a7e79
Update dependencies from https://github.com/dotnet/sdk build 20210930.10
...
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
From Version 7.0.100-alpha.1.21480.9 -> To Version 7.0.100-alpha.1.21480.10
2021-09-30 17:07:26 +00:00
dotnet-maestro[bot]
c97c7983ec
Update dependencies from https://github.com/dotnet/sdk build 20210930.9
...
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
From Version 7.0.100-alpha.1.21480.8 -> To Version 7.0.100-alpha.1.21480.9
2021-09-30 17:07:18 +00:00
dotnet-maestro[bot]
11349b99d0
Update dependencies from https://github.com/dotnet/sdk build 20210930.8 ( #12213 )
...
[main] Update dependencies from dotnet/sdk
2021-09-30 17:03:19 +00:00
Jonathan Peppers
293916662e
Update Maui/Xamarin manifests for .NET 6 RC 2
...
Bump to: xamarin/xamarin-android/release/6.0.1xx-preview9@2c2302a
Bump to: xamarin/xamarin-macios/release/6.0.1xx-preview9@233cef2
Bump to: dotnet/maui/release/6.0.1xx-preview9@f3f8f5f
Our version numbers have switched from `rc.2` to `preview.9`, and we
incremented `*.100` to `*.101`.
After `.\build.cmd -pack -publish`, manually tested the workloads:
> $env:DOTNET_MULTILEVEL_LOOKUP=0
> .\artifacts\bin\redist\Debug\dotnet\dotnet.exe workload install android --skip-manifest-update
Installing pack Microsoft.Android.Sdk version 31.0.101-preview.9.16...
...
> .\artifacts\bin\redist\Debug\dotnet\dotnet.exe workload install ios --skip-manifest-update
Installing pack Microsoft.iOS.Sdk version 15.0.101-preview.9.31...
...
> .\artifacts\bin\redist\Debug\dotnet\dotnet.exe workload install maccatalyst --skip-manifest-update
Installing pack Microsoft.MacCatalyst.Sdk version 15.0.101-preview.9.31...
...
> .\artifacts\bin\redist\Debug\dotnet\dotnet.exe workload install macos --skip-manifest-update
Installing pack Microsoft.macOS.Sdk version 12.0.101-preview.9.31...
...
> .\artifacts\bin\redist\Debug\dotnet\dotnet.exe workload install tvos --skip-manifest-update
Installing pack Microsoft.tvOS.Sdk version 15.0.101-preview.9.31...
...
> .\artifacts\bin\redist\Debug\dotnet\dotnet.exe workload install maui --skip-manifest-update
Installing pack Microsoft.Maui.Core.Ref.ios version 6.0.101-preview.9.1805...
2021-09-30 11:58:20 -05:00
dotnet-maestro[bot]
cfb902dbd9
Update dependencies from https://github.com/dotnet/sdk build 20210930.7 ( #12212 )
...
[main] Update dependencies from dotnet/sdk
2021-09-30 11:12:34 +00:00
dotnet-maestro[bot]
22e996648b
Update dependencies from https://github.com/dotnet/sdk build 20210929.52 ( #12208 )
...
[main] Update dependencies from dotnet/sdk
2021-09-30 08:17:03 +00:00
dotnet-maestro[bot]
9afa6ad654
Update dependencies from https://github.com/dotnet/sdk build 20210929.47 ( #12206 )
...
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.Net.Compilers.Toolset: from 4.0.0-5.21479.6 to 4.0.0-5.21479.8 (parent: Microsoft.NET.Sdk)
2021-09-30 07:01:25 +00:00
dotnet-maestro[bot]
f2d5177bf1
Update dependencies from https://github.com/dotnet/sdk build 20210929.41 ( #12205 )
...
[main] Update dependencies from dotnet/sdk
2021-09-30 05:41:48 +00:00
dotnet-maestro[bot]
9a8e73564c
Update dependencies from https://github.com/dotnet/sdk build 20210929.38 ( #12203 )
...
[main] Update dependencies from dotnet/sdk
2021-09-30 04:42:21 +00:00
dotnet-maestro[bot]
aad42b04d3
Update dependencies from https://github.com/dotnet/sdk build 20210929.33 ( #12201 )
...
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.Net.Compilers.Toolset: from 4.0.0-5.21479.3 to 4.0.0-5.21479.6 (parent: Microsoft.NET.Sdk)
2021-09-30 03:48:23 +00:00
dotnet-maestro[bot]
b5a29f9ca6
Update dependencies from https://github.com/dotnet/sdk build 20210929.28 ( #12199 )
...
[main] Update dependencies from dotnet/sdk
2021-09-30 02:26:24 +00:00
dotnet-maestro[bot]
ceacc9c349
Update dependencies from https://github.com/dotnet/sdk build 20210929.22 ( #12196 )
...
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.Net.Compilers.Toolset: from 4.0.0-5.21478.20 to 4.0.0-5.21479.3 (parent: Microsoft.NET.Sdk)
2021-09-30 01:22:12 +00:00
dotnet-maestro[bot]
984197c9cf
Update dependencies from https://github.com/dotnet/test-templates build 20210929.1 ( #12198 )
...
[main] Update dependencies from dotnet/test-templates
2021-09-30 01:19:37 +00:00
dotnet-maestro[bot]
5735105141
Update dependencies from https://github.com/dotnet/sdk build 20210929.21 ( #12194 )
...
[main] Update dependencies from dotnet/sdk
2021-09-29 23:48:57 +00:00
Marc Paine
7b637144b6
Merge pull request #12190 from uweigand/s390x-part2-rc2
...
Add support for s390x architecture, part 2
2021-09-29 14:38:07 -07:00
dotnet-maestro[bot]
8d8a8640eb
Update dependencies from https://github.com/dotnet/sdk build 20210929.16 ( #12192 )
...
[main] Update dependencies from dotnet/sdk
2021-09-29 21:28:50 +00:00
Michael Simons
0e1b32b8ee
[ArPow] Add support to build source-build from specific installer commit ( #12186 )
...
* Add support to build source-build from specific installer commit
* Fix nuget.client repo name
2021-09-29 20:48:16 +00:00
dotnet-maestro[bot]
aac9dd7822
Update dependencies from https://github.com/dotnet/sdk build 20210929.13 ( #12189 )
...
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.NET.ILLink.Tasks: from 7.0.100-1.21478.1 to 7.0.100-1.21479.1 (parent: Microsoft.NET.Sdk)
2021-09-29 19:04:02 +00:00
Ulrich Weigand
9ab241ff4c
Add support for s390x architecture, part 2
...
* Add linux-s390x RID for aspnetcore net6.0 to GenerateBundledVersions
* Add s390x build architecture in ArPow smoke-test.sh
2021-09-29 18:15:59 +02:00
Michael Simons
2779433e56
Move roslyn-analyzer patches ( #12183 )
2021-09-29 16:06:42 +00:00
dotnet-maestro[bot]
73609f9d4b
Update dependencies from https://github.com/dotnet/sdk build 20210929.11 ( #12184 )
...
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
- VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21477.12 to 7.0.0-alpha.1.21479.1 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Ref: from 7.0.0-alpha.1.21477.12 to 7.0.0-alpha.1.21479.1 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.NetCore.TargetingPack.x64.7.0: from 7.0.0-alpha.1.21477.12 to 7.0.0-alpha.1.21479.1 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21477.12 to 7.0.0-alpha.1.21479.1 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Host.win-x64: from 7.0.0-alpha.1.21477.12 to 7.0.0-alpha.1.21479.1 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.DotNetHostResolver: from 7.0.0-alpha.1.21477.12 to 7.0.0-alpha.1.21479.1 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.Platforms: from 7.0.0-alpha.1.21477.12 to 7.0.0-alpha.1.21479.1 (parent: Microsoft.NET.Sdk)
2021-09-29 15:05:09 +00:00
Michael Simons
a3e91ed179
Cleanup disabled ExtractLinkerPackageToCache linker target ( #12164 )
2021-09-29 09:00:40 -05:00
dotnet-maestro[bot]
788c3a53b5
Update dependencies from https://github.com/dotnet/sdk build 20210929.8 ( #12181 )
...
[main] Update dependencies from dotnet/sdk
2021-09-29 11:42:48 +00:00
dotnet-maestro[bot]
06e35fd7d0
Update dependencies from https://github.com/dotnet/sdk build 20210929.2 ( #12178 )
...
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.Net.Compilers.Toolset: from 4.0.0-5.21478.16 to 4.0.0-5.21478.20 (parent: Microsoft.NET.Sdk)
2021-09-29 09:34:13 +00:00
dotnet-maestro[bot]
ba40eb2616
Update dependencies from https://github.com/dotnet/sdk build 20210929.1 ( #12177 )
...
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.Net.Compilers.Toolset: from 4.0.0-5.21478.13 to 4.0.0-5.21478.16 (parent: Microsoft.NET.Sdk)
2021-09-29 08:32:12 +00:00
dotnet-maestro[bot]
eaa774c109
Update dependencies from https://github.com/dotnet/sdk build 20210928.49 ( #12175 )
...
[main] Update dependencies from dotnet/sdk
2021-09-29 06:47:36 +00:00
dotnet-maestro[bot]
36b40178e4
Update dependencies from https://github.com/dotnet/sdk build 20210928.48 ( #12174 )
...
[main] Update dependencies from dotnet/sdk
2021-09-29 05:20:42 +00:00
dotnet-maestro[bot]
b6f670b445
Update dependencies from https://github.com/dotnet/sdk build 20210928.45 ( #12173 )
...
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.NET.ILLink.Tasks: from 6.0.100-1.21473.1 to 7.0.100-1.21478.1 (parent: Microsoft.NET.Sdk)
2021-09-29 03:34:28 +00:00
dotnet-maestro[bot]
48d58f392a
Update dependencies from https://github.com/dotnet/sdk build 20210928.41 ( #12171 )
...
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.Net.Compilers.Toolset: from 4.0.0-5.21478.7 to 4.0.0-5.21478.13 (parent: Microsoft.NET.Sdk)
2021-09-29 02:49:52 +00:00
dotnet-maestro[bot]
61e908e9ad
Update dependencies from https://github.com/dotnet/sdk build 20210928.34 ( #12168 )
...
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.Net.Compilers.Toolset: from 4.0.0-5.21478.2 to 4.0.0-5.21478.7 (parent: Microsoft.NET.Sdk)
2021-09-29 00:44:18 +00:00
Michael Simons
1c32c5f845
[ArPow] Update source-build commit shas ( #12161 )
2021-09-28 19:26:00 -05:00
Eric StJohn
6a6bffe699
Merge pull request #12106 from ericstj/moveInstallLocation
...
Remove writing InstallLocation from SDK, it will be handled by host
2021-09-28 14:11:23 -07:00