Chris Rummel
b412c61801
Re-enable F# tests that should work now. ( #12686 )
...
* Re-enable F# tests that should work now.
* Also re-enable some web tests that should work now.
2021-11-17 01:48:47 +00:00
dotnet-maestro[bot]
4078d7d023
Merge pull request #12613 from dotnet/darc-release/6.0.2xx-1b244fc7-ac70-4eca-9fcf-17a28ef743e0
...
[release/6.0.2xx] Update dependencies from dotnet/sdk
2021-11-16 12:29:44 -08:00
Michael Simons
054be7f395
Merge pull request #12674 from mmitche/merge-from-2xx
...
[main] Merge from release/6.0.2xx
2021-11-16 13:06:29 -06:00
MichaelSimons
bbe021ff2b
Resolve source-build patch conflicts
2021-11-16 18:19:09 +00:00
Daniel Plaisted
d608d977da
Merge pull request #12657 from dotnet/marcpopMSFT-WDarm64targeting50
...
Looks like our logic for the RID for WindowsDesktop was merged incorrectly into 6.0
2021-11-15 18:48:57 -08:00
Dan Seefeldt
7f02ccd30f
Fix previously-source-built bootstrap ( #12642 )
...
* Fix previously-source-built bootstrap
* Update based on review comments
* Update to write lines more efficiently
2021-11-15 23:44:44 +00:00
Matt Mitchell
0187877967
Merge remote-tracking branch 'upstream/release/6.0.2xx' into merge-from-2xx
2021-11-15 12:39:15 -08:00
Marc Paine
69022825a3
Update GenerateBundledVersions.targets
2021-11-15 12:39:02 -08:00
Marc Paine
1c4f356c21
Merge pull request #12614 from dotnet/marcpopMSFT-localizestrings
...
Localize DOTNET HOME strings
2021-11-15 12:38:06 -08:00
Alex Perovich
8c09aecb90
Port #12374 to release/6.0.2xx ( #12635 )
...
Add downloading of runtime assets from dotnetbuilds
2021-11-15 08:37:15 -08:00
Alex Perovich
86fe76957f
Port #12374 to release/6.0.1xx ( #12636 )
...
Add downloading of runtime assets from dotnetbuilds
2021-11-15 08:37:04 -08:00
Marc Paine
fb42fb7282
Update GenerateBundledVersions.targets
2021-11-12 13:47:22 -08:00
Matt Mitchell
dcc0e61aa1
Update 6.0 implicit versions
2021-11-12 12:46:54 -08:00
Davis Goodin
76d625236e
Allow SDK to produce reference assemblies ( #12549 )
2021-11-12 19:47:56 +00:00
Omair Majid
457210a04c
Also publish non-portable RID runtime symbols tarball ( #12622 )
...
This fixes a regression in .NET 6 source-build compared to the .NET
5 source-build.
source-build wants to publish runtime symbols tarball for portable (eg,
linux-x64) and non-portable (eg, fedora.33-x64) RIDs here after a build.
Following .NET 5 conventions, I expected to see:
./artifacts/x64/Release/runtime/dotnet-runtime-symbols-fedora.34-x64-6.0.0.tar.gz
./artifacts/x64/Release/runtime/dotnet-runtime-symbols-linux-x64-6.0.0.tar.gz
Unfortunately, only the portable RID (linux-x64) tarball is present
after a full source-build in .NET 6.
It turns out this is a bug in our build scripts. We try and copy
binaries - including the symbol tarballs - after building each of
runtime-portable and runtime. However, the target dependency is wrong:
after `Build`, the intermediate package doesn't exist from the
just-built repo.
What ends up happening is that nothing is copied after building
runtime-portable. However, after building runtime, the runtime-portable
intermediate artifacts are found and copied over. So the end
build has portable RID symbos, but not the non-portable ones.
Fix that by changing the dependency of this target so it runs after
intermediate packages are available.
2021-11-12 19:35:39 +00:00
Davis Goodin
772d572a31
dotnet/runtime: Disable package validation in source-build for reliability ( #12526 )
2021-11-12 09:36:27 -06:00
Michael Simons
9056116cb3
Increase source-build tarball build timeout ( #12652 )
2021-11-12 09:31:38 -06:00
Daniel Plaisted
a329cf4049
Merge pull request #12600 from dsplaisted/workload-manifest-msis
...
Bundle workload manifests as separate MSIs
2021-11-11 13:10:09 -08:00
Marc Paine
56b2f07db1
Merge pull request #12550 from dotnet/marcpopMSFT-6.0branding
...
Update to 6.0 in our wxl files as that was reverted a while back.
2021-11-11 12:50:22 -08:00
Daniel Plaisted
9e40d10b11
Merge release/6.0.1xx into release/6.0.2xx
2021-11-11 12:36:42 -08:00
Davis Goodin
0527f05018
dotnet/runtime: Enable source-link in source-build for '.version' file ( #12527 )
2021-11-11 13:16:59 -06:00
Michael Simons
84217d6e27
Specify depth when updating submodules ( #12588 )
2021-11-11 08:22:24 -06:00
Daniel Plaisted
f835fd64af
Merge pull request #12516 from tmds/portable_rid_default
...
GetRuntimeInformation.targets: determine PortableProductMonikerRid based on OSName and Architecture.
2021-11-10 09:54:10 -08:00
William Godbe
3ab6db321c
Update Asp.Net template versions ( #12599 )
...
* Update Asp.Net template versions
* Updated package name
Co-authored-by: Brennan <brecon@microsoft.com>
2021-11-10 09:18:16 -08:00
Jason Zhai
a86b293e8b
Merge branch 'release/6.0.2xx' into main
2021-11-08 19:06:39 -08:00
Lee Coward
376f058e9e
Merge pull request #12618 from dotnet/leecow-snaps
...
update snap yaml to resolve libicu issues on some distros
2021-11-08 12:43:14 -08:00
Lee Coward
330750412c
update snam yaml to resolve some issues
2021-11-08 11:14:11 -08:00
Djuradj Kurepa
8762385417
include System.Net.Http version 4.3.4
2021-11-08 10:41:56 +01:00
Marc Paine
dbb47fa43a
Update bundle.thm
2021-11-05 16:06:27 -07:00
Marc Paine
161a9dcde2
Enable the DOTNET HOME mesage to be localizable.
2021-11-05 15:11:40 -07:00
Marc Paine
ec997a96d0
Enable localization of some wxs strings
2021-11-05 11:48:22 -07:00
Marc Paine
86cb0ed124
Update the release notes link.
2021-11-05 11:11:00 -07:00
Djuradj Kurepa
4b5642d215
Change back to WindowsAzure.Storage and update the version to 9.3.3
2021-11-05 12:57:17 +01:00
Eric StJohn
bfabeefa4d
Remove install location from Windows conclusion ( #12401 )
...
* Remove install location from Windows conclusion
DOTNETHOME will not always be set in the bundle.
It's only set when an existing installation was present and the bundle is run.
As a result this string is sometimes empty. Remove it to avoid confusion.
* Update src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl
Co-authored-by: Maira Wenzel <mairaw@microsoft.com>
* Spanish
Co-authored-by: Maira Wenzel <mairaw@microsoft.com>
Co-authored-by: Carlos Sanchez <1175054+carlossanlop@users.noreply.github.com>
2021-11-04 13:16:14 -07:00
Marc Paine
e5cb4120c2
Update bundle.thm
2021-11-04 11:36:49 -07:00
Djuradj Kurepa
0336fa748e
Resolve Microsoft.Data.OData Component Governance alert
2021-11-04 15:47:36 +01:00
Daniel Plaisted
2f331cfbc4
Verify that workload manifest MSIs are signed
2021-11-03 23:14:42 -07:00
Daniel Plaisted
590cbca7ea
Include workload manifests wixobj file
2021-11-03 10:35:42 -07:00
Daniel Plaisted
3217a5c4a3
Remove ALLOWMSIINSTALL property for workload manifest MSIs
2021-11-03 09:41:43 -07:00
Daniel Plaisted
69a868b025
Only download workload manifest MSIs on Windows and not ARM
2021-11-03 09:40:39 -07:00
Daniel Plaisted
61774f69e8
Stop generating manifest MSI VS Redist NuGet package
...
Reverts 41ef6e2cac
2021-11-03 09:08:58 -07:00
Tom Deseyn
892222071f
GetRuntimeInformation.targets: determine PortableProductMonikerRid based on HostOSName and Architecture.
2021-11-03 15:12:59 +01:00
MichaelSimons
e460f22d3d
Resolve source-build patch conflicts
2021-11-03 14:01:44 +00:00
Daniel Plaisted
082265dd3a
Bundle workload manifests as separate MSIs
2021-11-02 23:39:27 -07:00
Jason Zhai
6caea3c847
Merge branch 'release/6.0.1xx' into main
2021-11-02 23:02:47 -07:00
Marc Paine
fbf342ea55
Update GenerateBundledVersions.targets
2021-11-02 10:31:01 -07:00
Omair Majid
c603008d19
[release/6.0.1xx] [ArPow] Add smoke test for OmniSharp ( #12251 )
...
* [ArPow] Add smoke test for OmniSharp
* Try setting PATH for tests
Hopefully, this helps omnisharp find the SDK.
* edits necessary for 6.0 GA status
Co-authored-by: MichaelSimons <msimons@microsoft.com>
2021-11-02 09:00:09 -05:00
Michael Simons
4eaf8ab130
Merge pull request #12562 from MichaelSimons/ci-improvements
...
Enable offline build and capture artifacts in PR validation
2021-11-02 08:52:17 -05:00
MichaelSimons
eb7ff02c9a
Resolve source-build patch conflicts
2021-10-29 15:40:17 +00:00
Jason Zhai
3d723365aa
Merge branch 'release/6.0.1xx' into main
2021-10-28 23:16:31 -07:00