Commit graph

3719 commits

Author SHA1 Message Date
Marc Paine
a48bbcebec
Merge pull request #8371 from dotnet/marcpopMSFT-policheckRC
Update generatemsi.ps1
2020-09-01 14:35:18 -07:00
dotnet bot
f6f886a168
Update first run message (#8379) 2020-09-01 13:45:40 -07:00
Sarah Oslund
e24c5a18b0
Merge pull request #8364 from sfoslund/win4PartVersions
Updating bundled versions with 4 part windows versions
2020-09-01 11:04:45 -07:00
dotnet-maestro[bot]
b303c1b877
[release/5.0.1xx] Update dependencies from dotnet/sdk (#8370)
* Update dependencies from https://github.com/dotnet/sdk build 20200831.11

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 5.0.100-rc.1.20431.8 -> To Version 5.0.100-rc.1.20431.11

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 5.0.100-rc.1.20431.8 -> To Version 5.0.100-rc.1.20431.12

Dependency coherency updates

Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms
 From Version 5.0.0-rc.1.20431.5 -> To Version 5.0.0-rc.1.20431.7 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 5.0.100-rc.1.20431.8 -> To Version 5.0.100-rc.1.20431.13

Dependency coherency updates

Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.DotNet.Common.ItemTemplates
 From Version 5.0.0-rc.1.20431.5 -> To Version 5.0.0-rc.1.20431.7 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 5.0.100-rc.1.20431.8 -> To Version 5.0.100-rc.1.20431.15

Dependency coherency updates

Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.DotNet.Common.ItemTemplates
 From Version 5.0.0-rc.1.20431.5 -> To Version 5.0.0-rc.1.20431.7 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 5.0.100-rc.1.20431.8 -> To Version 5.0.100-rc.1.20431.18

Dependency coherency updates

Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.DotNet.Common.ItemTemplates
 From Version 5.0.0-rc.1.20431.5 -> To Version 5.0.0-rc.1.20431.7 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 5.0.100-rc.1.20431.8 -> To Version 5.0.100-rc.1.20451.1

Dependency coherency updates

Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.DotNet.Common.ItemTemplates
 From Version 5.0.0-rc.1.20431.5 -> To Version 5.0.0-rc.1.20431.14 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 5.0.100-rc.1.20431.8 -> To Version 5.0.100-rc.1.20451.2

Dependency coherency updates

Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.DotNet.Common.ItemTemplates
 From Version 5.0.0-rc.1.20431.5 -> To Version 5.0.0-rc.1.20431.14 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 5.0.100-rc.1.20431.8 -> To Version 5.0.100-rc.1.20451.3

Dependency coherency updates

Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.DotNet.Common.ItemTemplates
 From Version 5.0.0-rc.1.20431.5 -> To Version 5.0.0-rc.1.20431.14 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 5.0.100-rc.1.20431.8 -> To Version 5.0.100-rc.1.20451.4

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,Microsoft.WindowsDesktop.App,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.DotNet.Common.ItemTemplates,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates
 From Version 5.0.0-rc.1.20430.1 -> To Version 5.0.0-rc.1.20431.13 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 5.0.100-rc.1.20431.8 -> To Version 5.0.100-rc.1.20451.5

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,Microsoft.WindowsDesktop.App,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.DotNet.Common.ItemTemplates,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates
 From Version 5.0.0-rc.1.20430.1 -> To Version 5.0.0-rc.1.20431.13 (parent: Microsoft.NET.Sdk

* Fix SDK toolset zip base uri

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Matt Mitchell <mmitche@microsoft.com>
2020-09-01 07:59:25 -07:00
Marc Paine
fa6078282a Update generatemsi.ps1 2020-08-31 17:09:20 -07:00
Sarah Oslund
b5732c59b2 Updating bundled versions with 4 part windows versions 2020-08-31 11:51:22 -07:00
William Li
d94c0604e7 Merge branch 'release/5.0.1xx' into merge-release/5.0.1xx-preview8-pc1 2020-08-24 14:41:42 -07:00
dotnet-maestro[bot]
8a22a19fc5
[master] Update dependencies from dotnet/sdk (#8129)
[master] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20405.1 to 5.0.0-rc.1.20417.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20405.1 to 5.0.0-rc.1.20417.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20404.16 to 5.0.0-rc.1.20417.14 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20404.16 to 5.0.0-rc.1.20417.14 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20404.16 to 5.0.0-rc.1.20417.14 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20404.16 to 5.0.0-rc.1.20417.14 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20404.16 to 5.0.0-rc.1.20417.14 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20404.16 to 5.0.0-rc.1.20417.14 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20405.9 to 5.0.0-rc.1.20418.28 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20405.9 to 5.0.0-rc.1.20418.28 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20405.9 to 5.0.0-rc.1.20418.28 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 5.0.0-rc.1.20405.9 to 5.0.0-rc.1.20418.28 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 5.0.0-rc.1.20405.9 to 5.0.0-rc.1.20418.28 (parent: Microsoft.NET.Sdk)
  - dotnet-watch: from 5.0.0-rc.1.20405.9 to 5.0.0-rc.1.20418.28 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Common.ItemTemplates: from 5.0.0-rc.1.20407.1 to 5.0.0-rc.1.20407.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20370.3 to 5.0.0-rc.1.20417.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20405.1 to 5.0.0-rc.1.20417.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20405.1 to 5.0.0-rc.1.20417.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

- Updates:
  - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20407.9 to 5.0.100-rc.1.20419.19
  - Microsoft.NET.Sdk: from 5.0.100-rc.1.20407.9 to 5.0.100-rc.1.20419.19
  - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20405.1 to 5.0.0-rc.1.20417.4
  - Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20405.1 to 5.0.0-rc.1.20417.4
  - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20404.16 to 5.0.0-rc.1.20417.14
  - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20404.16 to 5.0.0-rc.1.20417.14
  - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20404.16 to 5.0.0-rc.1.20417.14
  - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20404.16 to 5.0.0-rc.1.20417.14
  - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20404.16 to 5.0.0-rc.1.20417.14
  - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20404.16 to 5.0.0-rc.1.20417.14
  - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20405.9 to 5.0.0-rc.1.20418.28
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20405.9 to 5.0.0-rc.1.20418.28
  - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20405.9 to 5.0.0-rc.1.20418.28
  - dotnet-dev-certs: from 5.0.0-rc.1.20405.9 to 5.0.0-rc.1.20418.28
  - dotnet-user-secrets: from 5.0.0-rc.1.20405.9 to 5.0.0-rc.1.20418.28
  - dotnet-watch: from 5.0.0-rc.1.20405.9 to 5.0.0-rc.1.20418.28
  - Microsoft.DotNet.Common.ItemTemplates: from 5.0.0-rc.1.20407.1 to 5.0.0-rc.1.20407.2
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20370.3 to 5.0.0-rc.1.20417.1
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20405.1 to 5.0.0-rc.1.20417.4
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20405.1 to 5.0.0-rc.1.20417.3

 - Address corssgen target issues

 - Merge branch 'darc-master-2e4e2d61-f78f-4bde-8947-ee1fee18e9a9' of https://github.com/dotnet/core-sdk into darc-master-2e4e2d61-f78f-4bde-8947-ee1fee18e9a9

 - Merge branch 'master' of https://github.com/dotnet/core-sdk into darc-master-2e4e2d61-f78f-4bde-8947-ee1fee18e9a9
2020-08-20 03:40:36 +00:00
Matt Mitchell
dc972b079f
Add light command packages gathering (#8191)
Call tasks to gather light command packages after the build of each
installer. The way this is implemented is not ideal. Because powershell
scripts are used to invoke the WiX toolset, the light command package
info must be kept in sync. That said, the command lines and input files
do not change very often.

It's also on the table for .NET 6 to change around and unify the WiX
calls between the repos.

This also changes around the batching for the template MSIs to be compatible
with the call to the light command task
2020-08-19 11:58:16 -07:00
William Li
ad6a4b6f56
Update implicit version for 3.1 runtime (#8164) 2020-08-14 08:58:20 -07:00
Matt Mitchell
91bf9b371c
Update min VS version in installer info (#8157) 2020-08-13 21:25:50 -07:00
Matt Mitchell
e4ad1969d3
Fixup license paths (#8160)
dummyeula.rtf is in the same location as the PS scripts
2020-08-13 12:51:33 -07:00
Matt Mitchell
99ee62375d Update min VS version in installer info 2020-08-13 09:59:48 -07:00
Jacques Eloff
06e4f20fb9 Ensure rzc.dll and PresentationBuildTasks.dll are signed 2020-08-11 14:23:35 -07:00
Jacques Eloff
05203da281 Ensure rzc.dll and PresentationBuildTasks.dll are signed after running crossgen 2020-08-11 11:07:31 -07:00
Sarah Oslund
eeef3c72e8 PR feedback 2020-08-05 10:20:22 -07:00
Sarah Oslund
ace6e859e7 Dynamically acquire branch info, remove branchinfo.props 2020-08-03 16:02:18 -07:00
Matt Mitchell
2195668cc4 Update channel 2020-07-15 13:44:35 -07:00
William Li
7aaf0d85d0 Add in cswinrt KnownFrameworkReference 2020-07-07 15:06:06 -07:00
Matt Mitchell
1f2fb0525f
Make some artifacts non-shipping (#7857)
Makes the following artifacts non-shipping:
- template msis
- sdkplaceholders
- sdk-internal archives

For now these have been preserved as non-shipping rather than not published at all.
They all get packaged up in the VS insertion nupkgs, so I think in reality we don't need them at all.
2020-06-25 11:36:38 -07:00
Matt Mitchell
85de1d64f7
Enable TLS1.2 in the generatenupkg step (#7833) 2020-06-19 08:49:35 -07:00
Juan Hoyos
f1564ea07f
Add arm64 as a possible WinForms arch (#7457)
* Add arm64 as a possible WinForms arch
* Add Winforms RT assets to shared and WindowsDesktop refs to ARM64 SDK
* Add ARM WindowsDesktop tests
2020-05-18 15:25:42 -07:00
Nikola Milosavljevic
0c591aede6
Merge pull request #7461 from NikolaMilosavljevic/ui.license
UI changes for .NET 5
2020-05-15 08:55:57 -07:00
Daniel Plaisted
9260c1cd14 Don't include ios, tvos, android, and browser RIDs for AppHosts 2020-05-14 10:39:46 -07:00
Alexander Köplinger
7931ca0ea1
Add browser-wasm and ios-x86 to .NET 5 runtime pack IDs (#7459)
Same as https://github.com/dotnet/installer/pull/7034
2020-05-13 23:46:29 +02:00
Nikola Milosavljevic (CLR)
4b0c84901a Update line endings 2020-05-13 13:07:27 -07:00
Nikola Milosavljevic (CLR)
11da7bddd8 UI changes for .NET 5 2020-05-13 06:26:10 -07:00
Juan Sebastian Hoyos Ayala
ad389aa073 Add Winforms RT assets to shared and WindowsDesktop refs to ARM64 SDK 2020-05-12 23:19:25 -07:00
Juan Sebastian Hoyos Ayala
e339d60b25 Add arm64 as a possible WinForms arch
Makes it possible to build/publish arm64 winforms app. WPF/Full Winforms+WPF should still fail as a build time scenario.
2020-05-12 19:00:13 -07:00
Eric Erhardt
efe7c8e566
Remove references to PlatformAbstractions. (#7408)
* Remove references to PlatformAbstractions.

This will allow us to remove the PlatformAbstractions library from dotnet/runtime.

Contributes to https://github.com/dotnet/runtime/issues/3470
2020-05-06 09:59:23 -05:00
William Li
ad590737e6 Correct remove WinForms logic 2020-04-30 15:28:15 -07:00
Matt Mitchell
3c6fe698ef [release/5.0.1xx-preview4] Generate versions sparsely (#7290)
* Publish productVersion sparsely
Do not publish the productVersion file in every leg. Publish only in win-x64,
so that we don't end up uploading it for every manifest. Publishing breaks in this scenario today.
This is a real bug in publishing, but we will probably tighten the restrictions in the
Publish to BAR step so that multi-publishign the same asset is an error.

Also remove the productCommit-* in cases where we have overlapping rids, which would cause the same problem
2020-04-27 08:06:24 -07:00
William Li
e93e74c7a7
Merge pull request #7119 from wli3/sign-Interactive.DependencyManager-master
Interactive.DependencyManager to sign files
2020-04-17 13:46:24 -07:00
William Li
ea3803ddf1 Correct tool path append 2020-04-12 20:47:01 -07:00
William Li
e6be6629bf Interactive.DependencyManager to sign files 2020-04-11 18:29:27 -07:00
Brian Robbins
0a51c1a44d Exclude desktop assemblies from crossgen. 2020-04-09 11:48:42 -07:00
Sarah Oslund
58e48acdbb
Merge pull request #7055 from sfoslund/UpdateReleaseNotes
Updating release notes url to net 5
2020-04-09 08:13:25 -07:00
Matt Mitchell
337f953a95 Revert incorrect changes 2020-04-08 13:12:41 -07:00
Matt Mitchell
eaf4ea023f Merge remote-tracking branch 'upstream/release/5.0.1xx-preview3' into merge/release/5.0.1xx-preview3-to-master 2020-04-08 13:12:12 -07:00
Matt Mitchell
f5e7d53b35
[release/5.0.1xx-preview3] Set up TLS 1.2 before calling dotnet-install for tests (#7068)
* Set TLS1.2 before running dotnet-install in tests
The new powershell process overrides the setting that build.ps1 sets up.

* Reduce logging verbosity
2020-04-08 13:07:50 -07:00
Matt Mitchell
6e7661bb24
Merge branch 'master' into merge/release/5.0.1xx-preview3-to-master 2020-04-08 13:04:15 -07:00
Sarah Oslund
67216ce780 Updating release notes url to net 5 2020-04-07 12:27:58 -07:00
Daniel Plaisted
f86d955689
Merge pull request #7034 from akoeplinger/add-ios-net5-runtimepacks
Add iOS/tvOS/Android to .NET5 runtime pack IDs
2020-04-07 08:42:00 -07:00
Alexander Köplinger
9fdf00af10 Add Android to .NET5 runtime pack IDs 2020-04-06 17:39:02 +02:00
Alexander Köplinger
8289cde9a0 Add tvOS to .NET5 runtime pack IDs 2020-04-06 17:38:50 +02:00
Alexander Köplinger
6de5203c5d Add iOS to .NET5 runtime pack IDs 2020-04-03 18:05:45 +02:00
Matt Mitchell
3ee962859a Update channel info and stage dependencies for preview3 2020-03-31 15:40:49 -07:00
Daniel Plaisted
30b2fc31c2
Merge pull request #6993 from mmitche/generate-checksums-using-new-arcade-task
Generate checksums using new arcade task
2020-03-31 14:10:07 -07:00
Sarah Oslund
0e7109c16e Adding crossgen support for win-arm64 builds 2020-03-30 14:28:22 -07:00
William Li
d98f5f18bc
Merge pull request #6934 from wli3/merge-master-3.1.3xx
Merge master 3.1.3xx
2020-03-29 22:26:33 -07:00