Commit graph

3478 commits

Author SHA1 Message Date
jbeisner
f55ddb8a15 Adding 2.1 and 2.2 Templates MSIs, part 3 2019-07-22 17:06:16 +00:00
jbeisner
4de1b875e5 Adding 2.1 and 2.2 Templates MSIs, part 2 2019-07-22 15:55:23 +00:00
jbeisner
49ad1e8dd5 Adding 2.1 and 2.2 Templates MSIs, part 1 2019-07-17 23:18:41 +00:00
John Beisner
a5630932ee
Merge pull request #3201 from johnbeisner/TemplateMSIs
Generate a MSI for templates and move templates to dotnet/Templates
2019-07-17 08:28:28 -07:00
Livar Cunha
34a888c02f Fixing the condition for when we do a build without a suffix (final branding). 2019-07-15 17:22:56 -07:00
Livar Cunha
5475a81a55 Switch to lower case t (templates) for the folder name under dotnet. 2019-07-15 10:25:17 -07:00
Livar Cunha
c35bcd49af Adding new templates folder to pkg native installer.
Moved templates folder under dotnet to Templates (capital T) and added dotnet/Templates to the deb installer.

Adding Templates to the sdk rpm native installer.
2019-07-14 22:21:30 -07:00
Livar Cunha
3247485b57 Re-enable the generation of the msbuildextensions nupkg. 2019-07-12 15:05:32 -07:00
jbeisner
e2eb862efb Creating a Windows MSI for templates. 2019-07-11 00:43:29 +00:00
Livar
192b7945f0
Update implicit versions for self-contained apps for 2.1 and 2.2 2019-07-09 14:51:56 -07:00
Daniel Plaisted
fec1bb4f16 Remove PackagesToReference metadata from Microsoft.NETCore.App KnownFrameworkReference 2019-07-08 16:00:33 -07:00
dotnet-maestro[bot]
eccec24551
[master] Update dependencies from aspnet/AspNetCore (#2811)
* Update dependencies from https://github.com/aspnet/AspNetCore build 20190708.2

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

* React to SPA template rename
2019-07-08 18:20:32 +00:00
jbeisner
9ec2da3408 Branding update to "preview8" 2019-07-02 00:13:44 +00:00
dotnet-maestro[bot]
76797cc920
[master] Update dependencies from dotnet/arcade (#2667)
* Update dependencies from https://github.com/dotnet/arcade build 20190626.44

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

* Add missing feed

* Use PackageDownload

* Update dependencies from https://github.com/dotnet/arcade build 20190627.39

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

* Use new apphost package and stop downloading extra packages
2019-06-28 13:15:43 +00:00
Chris Rummel
6962cd30c5 Allow specifying CoreSetupRid. 2019-06-25 12:08:51 -07:00
Chris Rummel
64ba96eac4 Don't copy over packages if there are no packages to copy. 2019-06-25 12:08:26 -07:00
Chris Rummel
194cdca506 Don't reset blob URL if we pass it in. 2019-06-25 12:08:11 -07:00
Dan Seefeldt
453414fc75 Consolidate MSBuild* versions for source-build (#2554) 2019-06-20 15:24:02 -07:00
Livar
5d80f38dba
Merge pull request #2005 from dotnet/darc-master-33a78994-1ff6-4b93-90fb-cbd9502e5547
[master] Update dependencies from dotnet/arcade
2019-06-18 16:52:59 -07:00
Parallels
eb29f40037 Fixing the property we use in the DotnetDebTool to get the path to a stage0 dotnet. 2019-06-18 16:38:26 -07:00
John Beisner
945767a2a2
Addressing VS signing errors. (#2500) 2019-06-18 06:49:09 -07:00
Nate McMaster
c3eb847334
Add linux-musl-arm64 to list of supported AspNetCore runtimes (#2441) 2019-06-12 13:42:09 -07:00
John Beisner
4c3683314b
Rename: "VS.Redist.Common.Net.Core.Toolset" -> "VS.Redist.Common.NetCore.Toolset" (#2403) 2019-06-11 13:16:26 -07:00
Daniel Plaisted
5293e96d5a
Merge pull request #2401 from dsplaisted/update-runtime-packs
Update runtime pack names
2019-06-10 17:57:09 -07:00
Daniel Plaisted
da3a92ae63 Remove unused apphost metadata from KnownFrameworkReference 2019-06-10 17:29:39 -07:00
John Beisner
1e7815b2dd
Produce Toolset MSI NuPkgs for insertion into VS (#2359)
* Produce Toolset MSI NuPkgs for insertion into VS; stop producing SDK bundle NuPkgs.
2019-06-10 16:00:53 -07:00
Daniel Plaisted
8aff01947a Update runtime pack names 2019-06-10 15:32:28 -07:00
Daniel Plaisted
202d9f2daa
Merge pull request #2279 from dsplaisted/add-ui-knownframeworks
Add KnownFrameworkReference items for WPF and WindowsForms profiles
2019-06-05 11:40:21 -07:00
Nick Guerrera
92d69e6885
Exclude sdk resolver layout from source build (#2232) 2019-06-04 13:05:25 -07:00
Daniel Plaisted
e5275d990f Add KnownFrameworkReference items for WPF and WindowsForms profiles 2019-06-03 19:01:54 -07:00
William Li
7cbec05bd5 correct branch info on master (#2253) 2019-06-03 17:30:28 -07:00
William Li
b47d352a48 Update branding to preview 7 2019-06-02 19:35:45 -07:00
William Li
f4215da1b7 Merge remote-tracking branch 'origin/release/3.0.1xx' into merges/release/3.0.1xx-to-master 2019-06-02 10:52:22 -07:00
Peter Huene
565e0d9b06
Update Microsoft.WindowsDesktop.App to mark as "Windows only".
This commit marks the `Microsoft.WindowsDesktop.App` known framework reference
as Windows only.  This will be used by a upcoming SDK change to ensure that
"Windows only" frameworks can only be used on Windows.
2019-05-30 17:35:20 -07:00
Nate McMaster
a0107cdb1d
Remove workaround for aspnet/AspNetCore#8835 (#2170)
* Remove workaround for aspnet/AspNetCore#8835

* Update GenerateLayout.targets

* Update ASP.NET Core to 3.0.0-preview6-19279-08
2019-05-30 10:48:46 -07:00
Peter Huene
33815f75c9
Remove Windows Desktop project templates for non-Windows.
This commit removes the Windows Desktop project templates for non-Windows
builds of the .NET Core SDK.

Fixes dotnet/cli#11425.
2019-05-29 19:06:11 -07:00
John Beisner
6392d02bf3
Updating some translations... (#2194) 2019-05-29 11:56:22 -07:00
John Beisner
808359df16
Increasing the SDK bundle installer button size 20-px (#2123)
* Increasing the SDK bundle installer button size 20-px
2019-05-24 15:24:24 -07:00
John Beisner
f55dd40436
Omit nupkgs and related files in the SDK bundle. (#2030) 2019-05-16 16:33:49 -07:00
John Beisner
d987a525c8
Resolve named CAB collision and drop the CABs (#1976)
* Resolve named CAB collision; drop the CABs.

* Resolving naming convention warning: 8 chars plus {0} are allowed.

* Update src/redist/targets/packaging/windows/clisdk/dotnet.wxs

Co-Authored-By: Peter Huene <pehuene@microsoft.com>
2019-05-16 16:33:29 -07:00
John Beisner
8ae3afa572
Updating projectUrl values from "cli" to "core-sdk" (#1800) 2019-05-16 16:32:26 -07:00
Nate McMaster
d30a9f5c83
Remove dotnet-sql-cache from the CLI (#2014) 2019-05-16 07:49:25 -07:00
Daniel Plaisted
865f1c2745
Merge pull request #1992 from sbomer/isTrimmable
Mark Microsoft.NETCore.App as trimmable
2019-05-15 16:31:10 -07:00
Sven Boemer
39212e1699 Define NetCoreRoot (#1997)
This will be used by the SDK to locate the dotnet host when running in
desktop msbuild. Necessary for tools that always run on .NET Core,
like the IL Linker.
2019-05-15 14:24:56 -07:00
John Beisner
b0f2205264
Adding localization to the Windows SDK bundle installers (#1996)
* Adding localization to the Windows SDK bundle installers
2019-05-15 12:51:44 -07:00
Livar Cunha
6e33b6e3de Fix implicit versions for self-contained apps. Updated versions to 1.0.16, 1.1.13, 2.1.11 and 2.2.5. 2019-05-14 11:23:04 -07:00
Sven Boemer
8c81543eb5 Mark Microsoft.NETCore.App as trimmable
The SDK will be updated to flow this metadata to resolved dlls,
influencing the default linker behavior.
2019-05-14 08:45:50 -07:00
Daniel Plaisted
75702b2d6e
Merge pull request #1839 from dagood/fix-core-setup-download
Fix core-setup update: download consolidated dotnet-runtime-deps Deb pkg
2019-05-03 16:03:57 -07:00
Davis Goodin
3985d797c8 Download consolidated dotnet-runtime-deps Deb pkg 2019-05-03 17:18:14 -05:00
Ricardo Arenas
1c52fe86a7 make publish of internal asset conditional (#1832) 2019-05-02 10:50:02 -07:00
Daniel Plaisted
8bcd7ee623 Add PackagesToReference metadata to KnownFrameworkReference
The SDK will consume this to generate PackageReferences to "empty" packages such as Microsoft.NETCore.App
2019-04-26 08:47:25 -07:00
Daniel Plaisted
44f0335886
Merge pull request #1765 from dsplaisted/remove-runtimepack-internal
Don't use .Internal suffix for runtime packs
2019-04-26 08:30:45 -07:00
Daniel Plaisted
de6f99b7ad Don't use .Internal suffix for runtime packs
This was removed with https://github.com/dotnet/core-setup/pull/6096
2019-04-26 08:14:05 -07:00
John Beisner
fe905c81da
SDK bundle UI modifications (#1756)
* SDK bundle UI modifications.
2019-04-26 08:06:14 -07:00
Daniel Plaisted
f21fc9c2ba
Merge pull request #1748 from dsplaisted/use-internal-netcoreapp-package
Switch to  .Internal insertion package for .NET Core
2019-04-25 11:18:30 -07:00
Daniel Plaisted
27be26f712 Switch to .Internal insertion package for .NET Core 2019-04-25 08:51:39 -07:00
John Beisner
ca9216c97d
[WIP] Removal of additional package feeds set by default (#1561)
Removal of additional package feeds set by default
2019-04-23 10:33:16 -07:00
William Li
12b159311d Update branding to preview 6 2019-04-21 18:15:11 -07:00
William Li
d734147745 Revert src/CopyToLatest/targets/BranchInfo.props change 2019-04-21 17:40:05 -07:00
Daniel Plaisted
3289119b23 Update apphost pack pattern 2019-04-19 10:54:35 -07:00
John Beisner
07b074acf7
adding .Net core AppHost pack (#1519)
* adding .Net core AppHost pack
2019-04-17 12:53:05 -07:00
Daniel Plaisted
9f998eabcd Switch to .Ref targeting pack for .NET Standard 2.1 2019-04-15 19:04:36 -07:00
dotnet-maestro[bot]
16daae1035
[master] Update dependencies from dotnet/core-setup (#1447)
* Update dependencies from https://github.com/dotnet/core-setup build 20190412.04

- Microsoft.NETCore.App - 3.0.0-preview5-27612-04
- Microsoft.WindowsDesktop.App - 3.0.0-preview5-27612-04
- NETStandard.Library.Ref - 2.1.0-preview5-27612-04

* Update dependencies from https://github.com/dotnet/core-setup build 20190412.06

- Microsoft.NETCore.App - 3.0.0-preview5-27612-06
- Microsoft.WindowsDesktop.App - 3.0.0-preview5-27612-06
- NETStandard.Library.Ref - 2.1.0-preview5-27612-06

* Updating 'windowsdesktop-runtime' asset names and blob paths.

* Updating the blob root...

* Updating the RID for 'windowsdesktop-runtime' archive.
2019-04-12 20:15:30 +00:00
John Beisner
0d4bdcd199
adding .Net standard 2.1 Targeting Packs (#1309)
* adding .Net standard 2.1 Targeting Packs
2019-04-10 08:55:46 -07:00
Nick Guerrera
28e5c54dfe Merge branch 'master' into merges/release/3.0.1xx-to-master 2019-04-09 11:13:55 -07:00
Nick Guerrera
5c96d57220
[release/3.01xx] Bump latest 2.1/2.2 in bundled versions (#1307) 2019-04-09 11:06:05 -07:00
William Li
1f8839eb4a Revert <Channel>release/3.0.1xx</Channel> back 2019-04-08 11:00:59 -07:00
William Li
afb5778559 Update branding to preview5 2019-04-07 16:35:28 -07:00
William Li
219089e762
Merge pull request #1133 from nguerrera/remove-azure-dependency-from-source-build
Remove dependency on WindowsAzure.Storage in source build
2019-04-04 16:28:13 -07:00
William Li
6400435101
Merge pull request #1121 from bricelam/ef-no
Remove dotnet-ef
2019-04-04 11:00:46 -07:00
John Beisner
4f57f8e679
Adding the NetCoreApp and ASP.Net Targeting Packs to the native MacOS installer (#1173)
Adding the NetCoreApp and ASP.Net Targeting Packs to the native MacOS installer - PKG
* Add the ASP.Net Targeting Pack from an archive.
2019-04-02 15:51:47 -07:00
Brice Lambson
331c153709
Remove dotnet-ef
Resolves aspnet/EntityFrameworkCore#14016
2019-04-02 15:03:32 -07:00
John Beisner
7289df22ae
Update release notes link; MacOS (#1181)
Update release notes link; MacOS
2019-04-02 13:12:17 -07:00
John Beisner
10224a8d3b
Linux native installer updates: DEB and RPM (#1122)
Adding targeting packs to native Linux installers.
 * Re-enable RPM and DEB installation testing.
2019-04-01 14:24:56 -07:00
Nick Guerrera
f688dc6920 Remove dependency on WindowsAzure.Storage in source build
The source code had already been conditioned out, but the conditional
PackageReference and DefineConstants got lost when this code moved to
core-sdk
2019-03-27 12:59:21 -07:00
Livar
13603f7be6
Merge pull request #1072 from riarenas/riarenas/fake-package
Add a fake nupkg project to be published to make dependency uptake ea…
2019-03-27 12:03:27 -07:00
jbeisner
5cc5e58dc8 Accessibility Insights warnings: tab stops and bounds fix. 2019-03-25 19:24:50 +00:00
Ricardo Arenas
da9a0ace42 Add a fake nupkg project to be published to make dependency uptake easier 2019-03-20 13:31:47 -07:00
John Beisner
ab479d5ed5
Include the WindowsDesktop targeting pack MSI in the SDK bundle installation. (#1062) 2019-03-19 14:15:32 -07:00
Livar
4d0678083d
Merge pull request #673 from dotnet/merges/release/3.0.1xx-to-master
Merge release/3.0.1xx to master
2019-03-18 10:47:45 -07:00
Nick Guerrera
1763e0dc07
Set DOTNET_ROOT appropriately in internal build Init.cmd (#993) 2019-03-14 16:40:43 -07:00
John Beisner
df11eb9367
SDK bundle installer and Accessibility Insights warnings (#1012)
* Addressing Accessibility Insights warnings regarding the consideration of 'Image' and 'Text' tags having 'Name' attributes.
2019-03-14 08:44:39 -07:00
Nick Guerrera
ddc9c162ed
Don't exclude files starting with . from nupkgs (#994)
This was preventing `dotnet --info` and `dotnet --version` from working
in internal build scenario.
2019-03-12 18:39:16 -07:00
Livar Cunha
28f32808f8 Merge remote-tracking branch 'upstream/release/3.0.1xx' into merges/release/3.0.1xx-to-master
* upstream/release/3.0.1xx: (109 commits)
  Updating the implicit 1.0/1.1 runtime versions for self-contained apps.
  Update dependencies from https://github.com/dotnet/toolset build 20190312.2
  Update dependencies from https://github.com/dotnet/toolset build 20190312.1
  Update dependencies from https://github.com/dotnet/toolset build 20190311.5
  Update dependencies from https://github.com/dotnet/toolset build 20190311.4
  Update dependencies from https://devdiv.visualstudio.com/DevDiv/_git/DotNet-Trusted build 20190311.38
  [release/3.0.1xx] Update dependencies from dotnet/toolset (#974)
  [release/3.0.1xx] Update dependencies from  1 repositories (#973)
  Update dependencies from https://github.com/dotnet/toolset build 20190311.1 (#972)
  [release/3.0.1xx] Update dependencies from  1 repositories (#926)
  Update dependencies from https://github.com/dotnet/standard build 20190308.1 (#939)
  Update dependencies from https://github.com/dotnet/core-setup build 20190309.01 (#935)
  [release/3.0.1xx] Update dependencies from dotnet/core-setup (#933)
  Update dependencies from https://github.com/dotnet/toolset build 20190308.9 (#930)
  Update dependencies from https://github.com/dotnet/toolset build 20190308.7 (#929)
  Update dependencies from https://github.com/dotnet/toolset build 20190308.8 (#928)
  Update dependencies from https://github.com/dotnet/toolset build 20190308.6 (#925)
  [release/3.0.1xx] Update dependencies from  1 repositories (#918)
  Update dependencies from https://github.com/dotnet/core-setup build 20190308.09 (#924)
  Update dependencies from https://github.com/dotnet/toolset build 20190308.5 (#921)
  ...

Conflicts:
eng/Version.Details.xml
eng/Versions.props
eng/common/generate-graph-files.ps1
global.json
src/redist/targets/GenerateBundledVersions.targets
2019-03-12 12:35:50 -07:00
Livar Cunha
facf810423 Updating the implicit 1.0/1.1 runtime versions for self-contained apps. 2019-03-12 10:26:26 -07:00
Livar Cunha
ae9a00dc2e Updating the implicit 1.0/1.1 runtime versions for self-contained apps. 2019-03-12 10:21:31 -07:00
dotnet-maestro[bot]
d72abce213 [release/3.0.1xx] Update dependencies from dotnet/toolset (#824)
* Update dependencies from https://github.com/dotnet/toolset build 20190304.4

This change updates the following dependencies
- Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview3.19154.4

* Pull toolset from new location
2019-03-04 09:03:03 -08:00
John Beisner
6aed0cd361
Fixing the SDK bundle installer's versioning. (#755) 2019-03-01 13:07:12 -08:00
John Beisner
7a40c294b8
Replace "MIT License" with ".NET Library EULA" in SDK bundle installer. (#757) 2019-03-01 13:06:49 -08:00
Livar Cunha
51323db8aa Undoing the 1.x implicit version changes. Those bits are not available in a feed yet. 2019-03-01 09:51:50 -08:00
Livar Cunha
d81616de3e Undoing the 1.x implicit version changes. Those bits are not available in a feed yet. 2019-03-01 09:51:05 -08:00
Livar
35fa79bcdc Updating self-contained app implicit versions 2019-03-01 08:53:16 -08:00
Livar
651147ff49
Updating self-contained app implicit versions 2019-03-01 08:51:14 -08:00
Nate McMaster
49d8bc9941
Update SDK to use aspnet runtime packs (#754)
React to deprecation of Microsoft.AspNetCore.App.

Changes:
* Update KnownFrameworkReference to use the new runtime packs
* Stop reference Microsoft.AspNetCore.App
* Stop generating unused variable in the SDK: BundledAspNetCoreAppPackageVersion and BundledAspNetCoreAppTargetFrameworkVersion
* Add prodcon entries for all aspnet dependencies. These may not have the same version in the future (like patch updates)
2019-02-28 10:13:03 -08:00
Nick Guerrera
85ce55487a
Use WindowsDesktop.App.*Ref*, add more packs to .zip (#698) 2019-02-26 11:09:56 -08:00
Nick Guerrera
18101b4d6c Merge branch 'master' into merges/release/3.0.1xx-to-master 2019-02-23 08:21:25 -08:00
John Beisner
3172bcef35
Modify the 'InstallLocation' registry key. (#636)
Before = SOFTWARE\dotnet\Setup\InstalledVersions\<arch>\sdk
After = SOFTWARE\dotnet\Setup\InstalledVersions\<arch>
2019-02-22 16:48:10 -08:00
Nate McMaster
5e940ca125
Replace aspnetcore-dev myget feed with dotnetfeed (#653) 2019-02-22 16:15:10 -08:00
Daniel Plaisted
d3a4753ef5 Merge release/3.0.1xx' into master 2019-02-21 14:33:02 -08:00
Nick Guerrera
557c5609d7
Fix typo in DOTNET_MULTILEVEL_LOOKUP in Init.cmd (#634) 2019-02-21 13:02:05 -08:00