Commit graph

3482 commits

Author SHA1 Message Date
William Li
4c79da6f03
Remove opensuse (#4955) 2019-09-29 20:58:16 -07:00
dotnet-maestro[bot]
61327a9bcb
[release/3.0.1xx] Update dependencies from dotnet/arcade (#4933)
* Update dependencies from https://github.com/dotnet/arcade build 20190924.3

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19474.3

* Update NuGet.config

* React to NuGet design change for PackageDownload with multiple versions

A single item must be used with semicolon-delimited versions.
2019-09-26 21:15:58 +00:00
Livar
ca0986c0ff
Updating branding to 3.0.1-servicing (#4924)
* Updating branding to 3.0.1-servicing

Also removed the DropSuffix so that we stop producing final branded builds for now.

* Address code review comments

Set DropSuffix to false instead of removing it.
2019-09-24 16:09:49 -07:00
dotnet-maestro[bot]
5f6a012764 [release/3.0.1xx] Update dependencies from dotnet/toolset (#4886)
* Update dependencies from https://github.com/dotnet/toolset build 20190917.12

- Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19467.12

Dependency coherency updates

- Microsoft.NET.Sdk - 3.0.100-rc2.19467.3 (parent: Microsoft.Dotnet.Toolset.Internal)

* Set to stable build
2019-09-18 00:20:16 -07:00
Matt Mitchell
88e6663236
Turn off stable builds (#4874) 2019-09-17 13:58:14 -07:00
Matt Mitchell
63f7b6f811
[release/3.0.1xx] Fix resource branding (#4859)
* Fix resource branding
The resource branding for MicrosoftNETCoreApp and the Windows desktop runtime does not come from the same properties any longer.  Use appropriate properties instead.

* Fix Linux native installer branding
2019-09-16 10:49:46 -07:00
Matt Mitchell
88949b55f5
Fix "you are using a preview version" message (#4860)
The property in the bundled version props file installed with the SDK is _NETCoreSdkIsPreview. We use the same property name to define this value when creating the props file. We build with a preview version of the SDK. Because this is set by the preview SDK, and already has a value, we will not reset it when DropSuffix=true. It will simply remain 'true'. Thus we will simply propagate that existing value into the new props file.  To fix, change the property name.
2019-09-16 10:47:04 -07:00
Matt Mitchell
2834b77278
Stabilize package versions (#4833) 2019-09-15 17:41:50 -07:00
dotnet-maestro[bot]
b6037e6820 [release/3.0.1xx] Update dependencies from aspnet/AspNetCore (#4851)
* Update dependencies from https://github.com/aspnet/AspNetCore build 20190915.2

- dotnet-user-secrets - 3.0.0-rc2.19465.2
- dotnet-watch - 3.0.0-rc2.19465.2
- Microsoft.AspNetCore.App.Ref - 3.0.0
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0
- dotnet-dev-certs - 3.0.0-rc2.19465.2
- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-rc2.19465.2

* Correctly identify aspnetcore blob subdir
2019-09-15 17:27:29 -07:00
dotnet-maestro[bot]
5c5cd9667f [release/3.0.1xx] Update dependencies from dotnet/core-setup (#4815)
* Update dependencies from https://github.com/dotnet/core-setup build 20190913.05

- Microsoft.NETCore.App - 3.0.0-rc2-19463-05
- NETStandard.Library.Ref - 2.1.0
- Microsoft.WindowsDesktop.App - 3.0.0-rc2-19463-05

Dependency coherency updates

- Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-rc2.19462.10 (parent: Microsoft.WindowsDesktop.App)
- Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0 (parent: Microsoft.WindowsDesktop.App)

* Add a dependency on Microsoft.NETCore.Platforms
This is not directly depended upon, but causes Maestro to flow stable feed locations.

* Use runtime package version

* Fix installer download locations

* Update windows desktop installer location

* Explicit reference the host model

* Make ref package version explicit

* Update property used to identify host version

* Update apphost versions

* Updated property versions to be used for branding, crossgen and bundled versions generation.
2019-09-13 18:36:11 -07:00
Chris Rummel
db6496271c Don't overwrite AspNetCoreSharedFxInstallerRid if it's already set. (#4734) 2019-09-11 15:45:08 -07:00
John Beisner
9d2ba908f0
Merge pull request #4638 from imba-tjd/patch-1
LOC update for zh-cn and zh-tw
2019-09-11 12:49:51 -07:00
Daniel Plaisted
82c5e8502c
Merge pull request #4600 from dotnet/merges/release/3.0.100-preview9-to-release/3.0.1xx
Merge release/3.0.100-preview9 to release/3.0.1xx
2019-09-10 17:13:37 -07:00
Daniel Plaisted
9931222c67 Update latest patch versions 2019-09-10 14:06:57 -07:00
Livar
527312b4af
Fixing channel 2019-09-10 13:37:30 -07:00
谭九鼎
5358c34cb7
Revert "Runtime" translation 2019-09-07 18:16:44 +08:00
谭九鼎
df3e5a9908
Update statement, add spaces, fix typo 2019-09-07 18:14:38 +08:00
Livar
8eedfce749
Updating branding to rc2 2019-09-05 12:41:56 -07:00
Livar Cunha
f0d988effa Fix the branch info information to use release/3.0.100-preview9. 2019-09-05 12:35:44 -07:00
Daniel Ye
8947097610 Localization update for PTB term changes. 2019-09-04 14:15:56 -07:00
Matt Mitchell
6ef4a17f0e
Fix branch info in release/3.0.1xx branch
Channel was changed incorrectly in https://github.com/dotnet/core-sdk/pull/4182/files
2019-08-27 13:06:39 -07:00
Livar
2243a75129
Merge branch 'release/3.0.1xx' into merges/release/3.0.100-preview9-to-release/3.0.1xx 2019-08-27 10:43:09 -07:00
jbeisner
acd7d01676 Add height to the 'FailureRestartText' 2019-08-26 15:39:30 -07:00
Matt Mitchell
7532bd3f62
Fix p9 branch channel. (#4179) 2019-08-22 15:58:51 -07:00
Livar
b830442d62
Updating release/3.0.1xx branding to rc1. 2019-08-20 14:07:50 -07:00
John Beisner
fd4ebe6d48
Merge pull request #4069 from johnbeisner/VS-ARP-PlaceHolder
SDK ARP Placeholder for Visual Studio
2019-08-19 17:23:34 -07:00
jbeisner
daee0c40db Updates per code review. 2019-08-19 11:15:40 -07:00
jbeisner
c3ae4a64a8 Updates per code review. 2019-08-16 21:54:47 +00:00
jbeisner
9fe66e5c0f Adding 'ARPNOREPAIR' 2019-08-16 19:24:07 +00:00
jbeisner
e367a32ce4 Introducing a SDK ARP Placeholder for Visual Studio 2019-08-16 18:56:20 +00:00
Zbyněk Sailer
3c07d89244 LOC CHECKIN | dotnet/core-sdk master | 20190813 (#3982) 2019-08-15 10:17:08 -07:00
jbeisner
2d53cf29ec Removing the RelativeLayoutPath: "shared" for the WinForms and Wpf ArchiveFile 2019-08-09 12:10:43 -07:00
Nick Guerrera
c37db568fe
Remove unused variables from bundled versions (#3742)
These are replaced by the ImplicitPackageReferenceVersion items, and were mostly removed from 2.x:  

4158f5e94f
2019-08-09 09:09:39 -07:00
jbeisner
c820b75ae8 Fixing a typo... 2019-08-08 12:37:16 -07:00
jbeisner
562adf13ea Updating the .NET Core installer welcome message. 2019-08-08 08:50:50 -07:00
jbeisner
a489af6341 Updating link; "Core" change to ".NET Core" 2019-08-06 09:12:39 -07:00
John Beisner
15fcfc5c6f
Merge pull request #3624 from johnbeisner/TemplateNupkgVersioning
Standardize 2.1/2.2/3.0 templates NuPkg version
2019-07-31 08:06:19 -07:00
Daniel Plaisted
c5a57d5805
Merge pull request #3576 from dsplaisted/crossgen-sdktasks
Fix crossgen for SDK tasks and native image symbol publishing
2019-07-30 18:09:46 -07:00
jbeisner
648c78a01e Use the SDK version as the NuPkg version for templates; remove superfluous WiX logic in the templates' MSI 2019-07-30 21:50:31 +00:00
Daniel Plaisted
446a3dc389 Change directory for native PDBs, so arcade should pick them up for publishing 2019-07-29 18:14:22 -07:00
Daniel Plaisted
3435d946ed Fix crossgen'ing .NET SDK build tasks 2019-07-29 18:13:54 -07:00
Livar
21de391bc1
Updating branding to preview9 2019-07-29 10:33:54 -07:00
Livar Cunha
a138255f58 Keep the latest channel as release/3.0.1xx. 2019-07-28 12:04:40 -07:00
Livar Cunha
4083b9eda1 Updating GenerateMSBuildExtensionsSWR to match what we actually insert into VS. 2019-07-26 10:38:38 -07:00
John Beisner
a3af2c43a5
Merge pull request #3383 from johnbeisner/TemplatesUpdate
Adding 2.1 and 2.2 Templates MSIs
2019-07-24 13:49:56 -07:00
Nick Guerrera
d1f57e32ce
Don't include WindowsDesktop targeting pack in x-plat tarball (#3403) 2019-07-24 11:02:42 -07:00
jbeisner
75e5139fe1 Merging master and resolving conflicts. 2019-07-24 16:14:47 +00:00
jbeisner
67c7c446f9 Updates per code review 2019-07-24 16:08:11 +00:00
jbeisner
249af0f120 Updates per code review. 2019-07-24 03:32:47 +00:00
Daniel Plaisted
5a590771e5
Merge pull request #2970 from dsplaisted/remove-legacyframeworkpackages
Remove PackagesToReference metadata from Microsoft.NETCore.App KnownFrameworkReference
2019-07-23 18:58:27 -07:00