The following was installed at /usr/local/share/dotnet
-
.NET Core SDK 2.0.0
-
.NET Core Runtime 2.0.0
-
Runtime Package Store
+
.NET Core SDK {DOTNETSDKVERSION}
+
.NET Core Runtime {DOTNETRUNTIMEVERSION}
+
ASP.NET Core Runtime {ASPNETCOREVERSION}
diff --git a/packaging/osx/clisdk/scripts/postinstall b/packaging/osx/clisdk/scripts/postinstall
index 8211444d2..28339be99 100755
--- a/packaging/osx/clisdk/scripts/postinstall
+++ b/packaging/osx/clisdk/scripts/postinstall
@@ -8,9 +8,6 @@ PACKAGE=$1
INSTALL_DESTINATION=$2
INSTALL_TEMP_HOME=/tmp/dotnet-installer
-# A temporary fix for the permissions issue(s)
-chmod -R 755 $INSTALL_DESTINATION
-
first_run() {
$INSTALL_DESTINATION/dotnet exec $INSTALL_DESTINATION/sdk/%SDK_VERSION%/dotnet.dll internal-reportinstallsuccess "$1" > /dev/null 2>&1 || true
}
diff --git a/packaging/rpm/dotnet-config.json b/packaging/rpm/dotnet-config.json
index 38f533bcb..d4d7a48c0 100644
--- a/packaging/rpm/dotnet-config.json
+++ b/packaging/rpm/dotnet-config.json
@@ -27,8 +27,8 @@
"package_version": "%SHARED_HOST_RPM_VERSION%"
},
{
- "package_name": "%ASPNETCOREPACKAGESTORE_RPM_PACKAGE_NAME%",
- "package_version": "%ASPNETCOREPACKAGESTORE_RPM_PACKAGE_VERSION%"
+ "package_name": "%ASPNETCORE_SHAREDFX_RPM_PACKAGE_NAME%",
+ "package_version": "%ASPNETCORE_SHAREDFX_RPM_PACKAGE_VERSION%"
}
],
"directories": [
diff --git a/packaging/rpm/scripts/after_install_host.sh b/packaging/rpm/scripts/after_install_host.sh
index 7bc9596c7..21999daaf 100644
--- a/packaging/rpm/scripts/after_install_host.sh
+++ b/packaging/rpm/scripts/after_install_host.sh
@@ -9,19 +9,18 @@ echo "Please visit http://aka.ms/dotnet-cli-eula for more information."
# Run 'dotnet new' as the user to trigger the first time experience to initialize the cache
echo "Welcome to .NET Core!
---------------------
-Learn more about .NET Core @ https://aka.ms/dotnet-docs. Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs.
+Learn more about .NET Core: https://aka.ms/dotnet-docs
+Use 'dotnet --help' to see available commands or visit: https://aka.ms/dotnet-cli-docs
-.NET Core Tools Telemetry
+Telemetry
+---------
+The .NET Core tools collect usage data in order to help us improve your experience. The data is anonymous and doesn't include command-line arguments. The data is collected by Microsoft and shared with the community. You can opt-out of telemetry by setting the DOTNET_CLI_TELEMETRY_OPTOUT environment variable to '1' or 'true' using your favorite shell.
+
+Read more about .NET Core CLI Tools telemetry: https://aka.ms/dotnet-cli-telemetry
+
+Configuring...
--------------
-The .NET Core Tools include a telemetry feature that collects usage information. It is important that the .NET Team understands how the tools are being used so that we can improve them.
-
-The data collected is anonymous and will be published in an aggregated form for use by both Microsoft and community engineers under the Creative Commons Attribution License.
-
-The .NET Core Tools telemetry feature is enabled by default. You can opt-out of the telemetry feature by setting an environment variable DOTNET_CLI_TELEMETRY_OPTOUT (for example, 'export' on macOS/Linux, 'set' on Windows) to true (for example, 'true', 1). You can read more about .NET Core tools telemetry at https://aka.ms/dotnet-cli-telemetry.
-
-Installation Note
---------------
-A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete."
+A command is running to populate your local package cache to improve restore speed and enable offline access. This command takes up to one minute to complete and only runs once."
first_run() {
/usr/share/dotnet/dotnet exec /usr/share/dotnet/sdk/%SDK_VERSION%/dotnet.dll internal-reportinstallsuccess "rpmpackage" > /dev/null 2>&1 || true
diff --git a/packaging/windows/clisdk/bundle.thm b/packaging/windows/clisdk/bundle.thm
index a9c3d64d3..797d2cab1 100644
--- a/packaging/windows/clisdk/bundle.thm
+++ b/packaging/windows/clisdk/bundle.thm
@@ -24,14 +24,15 @@
#(loc.WelcomeHeaderMessage)
- #(loc.WelcomeDescription)
- #(loc.LearnMoreTitle)
- #(loc.CoreDocumentationLink)
- #(loc.SDKDocumentation)
- #(loc.PrivacyStatementLink)
- #(loc.MITLicenseLink)
- #(loc.InstallationNoteTitle)
- #(loc.InstallationNote)
+ #(loc.WelcomeDescription)
+ #(loc.LearnMoreTitle)
+ #(loc.CoreDocumentationLink)
+ #(loc.SDKDocumentation)
+ #(loc.PrivacyStatementLink)
+ #(loc.MITLicenseLink)
+ #(loc.InstallationNoteTitle)
+ #(loc.InstallationNote)
+ #(loc.VisualStudioWarning)
diff --git a/packaging/windows/clisdk/bundle.wxl b/packaging/windows/clisdk/bundle.wxl
index a5b12953c..18fc7750c 100644
--- a/packaging/windows/clisdk/bundle.wxl
+++ b/packaging/windows/clisdk/bundle.wxl
@@ -50,9 +50,9 @@
The installation was successful
The following were installed at [DOTNETHOME]
- • .NET Core SDK 2.0.0
- • .NET Core Runtime 2.0.0
- • Runtime Package Store
+ • .NET Core SDK [DOTNETSDKVERSION]
+ • .NET Core Runtime [DOTNETRUNTIMEVERSION]
+ • ASP.NET Core Runtime [ASPNETCOREVERSION]
This product collects usage data
• More information and opt-out https://aka.ms/dotnet-cli-telemetry
@@ -74,4 +74,6 @@ Resources
Installation noteA command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete.
+ If you plan to use .NET Core 2.1 with Visual Studio, Visual Studio 2017 15.7 or newer is recommended. <A HREF="https://go.microsoft.com/fwlink/?linkid=866799">Learn More</A>.
+
diff --git a/packaging/windows/clisdk/bundle.wxs b/packaging/windows/clisdk/bundle.wxs
index 4f379ca3e..aeae3aad9 100644
--- a/packaging/windows/clisdk/bundle.wxs
+++ b/packaging/windows/clisdk/bundle.wxs
@@ -24,6 +24,9 @@
+
+
+
@@ -40,9 +43,9 @@
-
+
-
+
diff --git a/packaging/windows/clisdk/generatebundle.ps1 b/packaging/windows/clisdk/generatebundle.ps1
index 8b53d9591..a2b166baf 100644
--- a/packaging/windows/clisdk/generatebundle.ps1
+++ b/packaging/windows/clisdk/generatebundle.ps1
@@ -14,7 +14,9 @@ param(
[Parameter(Mandatory=$true)][string]$DotnetCLIDisplayVersion,
[Parameter(Mandatory=$true)][string]$DotnetCLINugetVersion,
[Parameter(Mandatory=$true)][string]$UpgradeCode,
- [Parameter(Mandatory=$true)][string]$Architecture
+ [Parameter(Mandatory=$true)][string]$Architecture,
+ [Parameter(Mandatory=$true)][string]$DotNetRuntimeVersion,
+ [Parameter(Mandatory=$true)][string]$AspNetCoreVersion
)
. "$PSScriptRoot\..\..\..\scripts\common\_common.ps1"
@@ -43,6 +45,8 @@ function RunCandleForBundle
-dAdditionalSharedFXMsiSourcePath="$AdditionalSharedFxMSIFile" `
-dAdditionalHostFXRMsiSourcePath="$AdditionalHostFxrMSIFile" `
-dAdditionalSharedHostMsiSourcePath="$AdditionalSharedHostMSIFile" `
+ -dDotNetRuntimeVersion="$DotNetRuntimeVersion" `
+ -dAspNetCoreVersion="$AspNetCoreVersion" `
-arch "$Architecture" `
-ext WixBalExtension.dll `
-ext WixUtilExtension.dll `
diff --git a/packaging/windows/clisdk/generatenupkg.ps1 b/packaging/windows/clisdk/generatenupkg.ps1
index ca91f2e3a..f2df9810d 100644
--- a/packaging/windows/clisdk/generatenupkg.ps1
+++ b/packaging/windows/clisdk/generatenupkg.ps1
@@ -26,7 +26,7 @@ function DownloadNugetExe
if (-not (Test-Path $NuGetExe)) {
Write-Output 'Downloading nuget.exe to ' + $NuGetExe
- wget https://dist.nuget.org/win-x86-commandline/v3.5.0-rc1/NuGet.exe -OutFile $NuGetExe
+ wget https://dist.nuget.org/win-x86-commandline/v4.7.0/nuget.exe -OutFile $NuGetExe
}
}
diff --git a/packaging/windows/eula.rtf b/packaging/windows/eula.rtf
new file mode 100644
index 000000000..7f40e11a8
--- /dev/null
+++ b/packaging/windows/eula.rtf
@@ -0,0 +1,97 @@
+{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\froman\fprq2\fcharset0 Times New Roman;}{\f3\fswiss\fprq2\fcharset0 Calibri;}}
+{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;}
+{\*\generator Riched20 10.0.10586}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1
+\pard\widctlpar\sb120\sa120\cf1\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\fs28\par
+\fs24 MICROSOFT .NET LIBRARY\fs28\par
+\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par
+
+\pard\widctlpar\fi-363\li720\sb120\sa120\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 updates,\par
+\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 supplements,\par
+\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 Internet-based services, and\par
+\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 support services\par
+
+\pard\widctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par
+BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE.\par
+IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par
+
+\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 1.\b0\f2\fs14\~\~\~\~\b\f0\fs19 INSTALLATION AND USE RIGHTS.\par
+
+\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Installation and Use.\b0\fs20\~You may install and use any number of copies of the software to design, develop and test your programs.\b\fs19\par
+\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Third Party Programs.\b0\fs20\~The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par
+
+\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 2.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DATA.\~\kerning0\b0\fs20 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services.\~You can learn more about data collection and use in the help documentation and the privacy statement at\~{\cf0\f3\fs24{\field{\*\fldinst{HYPERLINK "http://go.microsoft.com/fwlink/?LinkId=528096&clcid=0x409"}}{\fldrslt{\ul\cf2\cf2\ul\f0\fs20 http://go.microsoft.com/fwlink/?LinkId=528096}}}}\f0\fs20 . Your use of the software operates as your consent to these practices.\kerning36\b\fs19\par
+\fs20 3.\b0\f2\fs14\~\~\~\~\b\f0\fs20 ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\fs19\par
+
+\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs20 DISTRIBUTABLE CODE.\~\~\b0 The software is comprised of Distributable Code. \ldblquote Distributable Code\rdblquote is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\fs19\par
+
+\pard\widctlpar\fi-357\li1077\sb120\sa120\fs20 i.\b0\f2\fs14\~\~\~\~\~\~\b\f0\fs20 Right to Use and Distribute.\b0\fs19\par
+
+\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 You may copy and distribute the object code form of the software.\fs19\par
+\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\fs19\par
+
+\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 ii.\b0\f2\fs14\~\~\~\~\b\f0\fs20 Distribution Requirements.\b0\~\b For any Distributable Code you distribute, you must\b0\fs19\par
+
+\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 add significant primary functionality to it in your programs;\fs19\par
+\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 require distributors and external end users to agree to terms that protect it at least as much as this agreement;\fs19\par
+\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 display your valid copyright notice on your programs; and\fs19\par
+\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\fs19\par
+
+\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 iii.\b0\f2\fs14\~\~\~\b\f0\fs20 Distribution Restrictions.\b0\~\b You may not\b0\fs19\par
+
+\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 alter any copyright, trademark or patent notice in the Distributable Code;\fs19\par
+\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\fs19\par
+\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 include Distributable Code in malicious, deceptive or unlawful programs; or\fs19\par
+\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\fs19\par
+
+\pard\widctlpar\fi-358\li1792\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 the code be disclosed or distributed in source code form; or\fs19\par
+\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 others have the right to modify it.\fs19\par
+
+\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 4.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SCOPE OF LICENSE.\~\b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\b\par
+
+\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 work around any technical limitations in the software;\par
+\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par
+\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 publish the software for others to copy;\par
+\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 rent, lease or lend the software;\par
+\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 transfer the software or this agreement to any third party; or\par
+\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 use the software for commercial software hosting services.\par
+
+\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 5.\b0\f2\fs14\~\~\~\~\b\f0\fs19 BACKUP COPY.\~\b0 You may make one backup copy of the software. You may use it only to reinstall the software.\b\par
+\fs20 6.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DOCUMENTATION.\~\b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\b\par
+\fs20 7.\b0\f2\fs14\~\~\~\~\b\f0\fs19 EXPORT RESTRICTIONS.\~\b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see\~{\cf0\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\b\par
+\fs20 8.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SUPPORT SERVICES.\~\b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\b\par
+\fs20 9.\b0\f2\fs14\~\~\~\~\b\f0\fs19 ENTIRE AGREEMENT.\~\b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\b\par
+\fs20 10.\b0\f2\fs14\~\~\~\b\f0\fs19 APPLICABLE LAW.\par
+
+\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 United States.\~\b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\b\par
+\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par
+
+\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 11.\b0\f2\fs14\~\~\b\f0\fs19 LEGAL EFFECT.\~\b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\b\par
+\fs20 12.\b0\f2\fs14\~\~\b\f0\fs19 DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par
+
+\pard\widctlpar\li357\sb120\sa120\kerning0 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\b0\par
+
+\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 13.\b0\f2\fs14\~\~\b\f0\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par
+
+\pard\widctlpar\li357\sb120\sa120\kerning0\b0 This limitation applies to\par
+
+\pard\widctlpar\fi-363\li720\sb120\sa120\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par
+\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par
+
+\pard\widctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par
+\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\lang1033\par
+\lang9 Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\lang1033\par
+\kerning36\b EXON\'c9RATION DE GARANTIE.\~\b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\b\par
+LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES.\~\b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\b\par
+\kerning0\b0\lang9 Cette limitation concerne :\lang1033\par
+
+\pard\widctlpar\li720\sb120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\lang1033\par
+
+\pard\widctlpar\li720\sa120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\lang1033\par
+
+\pard\widctlpar\sb120\sa120\lang9 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\lang1033\par
+\kerning36\b EFFET JURIDIQUE.\~\b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\b\par
+\kerning0\fs20\lang1036\~\fs19\lang1033\par
+
+\pard\widctlpar\cf0\b0\f3\fs24\par
+}
+
\ No newline at end of file
diff --git a/run-build.ps1 b/run-build.ps1
index 4700306e9..ac0f08909 100644
--- a/run-build.ps1
+++ b/run-build.ps1
@@ -16,17 +16,31 @@ param(
if($Help)
{
- Write-Output "Usage: .\build.ps1 [-Configuration ] [-Architecture ] [-NoPackage] [-Help]"
+ Write-Output "Usage: .\run-build.ps1 [-Configuration ] [-Architecture ] [-NoPackage] [-NoBuild] [-Help]"
Write-Output ""
Write-Output "Options:"
Write-Output " -Configuration Build the specified Configuration (Debug or Release, default: Debug)"
- Write-Output " -Architecture Build the specified architecture (x64 or x86 (supported only on Windows), default: x64)"
+ Write-Output " -Architecture Build the specified architecture (x64, x86, arm, or arm64 , default: x64)"
Write-Output " -NoPackage Skip packaging targets"
Write-Output " -NoBuild Skip building the product"
Write-Output " -Help Display this help message"
exit 0
}
+# The first 'pass' call to "dotnet msbuild build.proj" has a hard-coded "WriteDynamicPropsToStaticPropsFiles" target
+# therefore, this call should not have other targets defined. Remove all targets passed in as 'extra parameters'.
+if ($ExtraParameters)
+{
+ $ExtraParametersNoTargets = $ExtraParameters.GetRange(0,$ExtraParameters.Count)
+ foreach ($param in $ExtraParameters)
+ {
+ if(($param.StartsWith("/t:", [StringComparison]::OrdinalIgnoreCase)) -or ($param.StartsWith("/target:", [StringComparison]::OrdinalIgnoreCase)))
+ {
+ $ExtraParametersNoTargets.Remove("$param") | Out-Null
+ }
+ }
+}
+
$env:CONFIGURATION = $Configuration;
$RepoRoot = "$PSScriptRoot"
if(!$env:NUGET_PACKAGES){
@@ -53,33 +67,33 @@ if (!(Test-Path $env:DOTNET_INSTALL_DIR))
mkdir $env:DOTNET_INSTALL_DIR | Out-Null
}
-
-
# Disable first run since we want to control all package sources
$env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
# Don't resolve shared frameworks from user or global locations
$env:DOTNET_MULTILEVEL_LOOKUP=0
+# Turn off MSBuild Node re-use
+$env:MSBUILDDISABLENODEREUSE=1
+
# Enable vs test console logging
$env:VSTEST_BUILD_TRACE=1
$env:VSTEST_TRACE_BUILD=1
# install a stage0
-if (!$env:DOTNET_TOOL_DIR)
-{
- $dotnetInstallPath = Join-Path $env:DOTNET_INSTALL_DIR "dotnet-install.ps1"
- Invoke-WebRequest -Uri "https://dot.net/v1/dotnet-install.ps1" -OutFile "$dotnetInstallPath"
+$dotnetInstallPath = Join-Path $env:DOTNET_INSTALL_DIR "dotnet-install.ps1"
+Invoke-WebRequest -Uri "https://dot.net/v1/dotnet-install.ps1" -OutFile "$dotnetInstallPath"
- Write-Output "$dotnetInstallPath -Channel ""release/2.0.0"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"""
- Invoke-Expression "$dotnetInstallPath -Channel ""release/2.0.0"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"""
- if ($LastExitCode -ne 0)
- {
- Write-Output "The .NET CLI installation failed with exit code $LastExitCode"
- exit $LastExitCode
- }
+$InstallArchitecture = $Architecture
+if($Architecture.StartsWith("arm", [StringComparison]::OrdinalIgnoreCase))
+{
+ $InstallArchitecture = "x64"
}
-else
+
+Write-Output "$dotnetInstallPath -version ""2.2.0-preview1-007799"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$InstallArchitecture"""
+Invoke-Expression "$dotnetInstallPath -version ""2.2.0-preview1-007799"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$InstallArchitecture"""
+
+if ($LastExitCode -ne 0)
{
Copy-Item -Recurse -Force $env:DOTNET_TOOL_DIR $env:DOTNET_INSTALL_DIR
}
@@ -94,7 +108,7 @@ if ($NoBuild)
}
else
{
- dotnet msbuild build.proj /p:Architecture=$Architecture /p:GeneratePropsFile=true /t:WriteDynamicPropsToStaticPropsFiles
+ dotnet msbuild build.proj /p:Architecture=$Architecture /p:GeneratePropsFile=true /t:WriteDynamicPropsToStaticPropsFiles $ExtraParametersNoTargets
dotnet msbuild build.proj /m /v:normal /fl /flp:v=diag /p:Architecture=$Architecture $ExtraParameters
if($LASTEXITCODE -ne 0) { throw "Failed to build" }
}
diff --git a/run-build.sh b/run-build.sh
index 29f99967b..3c08dc14e 100755
--- a/run-build.sh
+++ b/run-build.sh
@@ -51,6 +51,8 @@ DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
REPOROOT="$DIR"
ARCHITECTURE="x64"
+STAGE0_SOURCE_DIR=
+
source "$REPOROOT/scripts/common/_prettyprint.sh"
BUILD=1
@@ -61,66 +63,61 @@ CUSTOM_BUILD_ARGS=
# Set nuget package cache under the repo
[ -z $NUGET_PACKAGES ] && export NUGET_PACKAGES="$REPOROOT/.nuget/packages"
-args=( "$@" )
+args=( )
while [[ $# > 0 ]]; do
lowerI="$(echo $1 | awk '{print tolower($0)}')"
case $lowerI in
-c|--configuration)
export CONFIGURATION=$2
- args=( "${args[@]/$1}" )
- args=( "${args[@]/$2}" )
shift
;;
--nopackage)
export DOTNET_BUILD_SKIP_PACKAGING=1
- args=( "${args[@]/$1}" )
;;
--skip-prereqs)
# Allow CI to disable prereqs check since the CI has the pre-reqs but not ldconfig it seems
export DOTNET_INSTALL_SKIP_PREREQS=1
- args=( "${args[@]/$1}" )
;;
--nobuild)
BUILD=0
;;
- --architecture)
+ -a|--architecture)
ARCHITECTURE=$2
- args=( "${args[@]/$1}" )
- args=( "${args[@]/$2}" )
shift
;;
--runtime-id)
CUSTOM_BUILD_ARGS="/p:Rid=\"$2\""
- args=( "${args[@]/$1}" )
- args=( "${args[@]/$2}" )
shift
;;
# This is here just to eat away this parameter because CI still passes this in.
--targets)
- args=( "${args[@]/$1}" )
- args=( "${args[@]/$2}" )
shift
;;
--linux-portable)
LINUX_PORTABLE_INSTALL_ARGS="--runtime-id linux-x64"
- CUSTOM_BUILD_ARGS="/p:Rid=\"linux-x64\" /p:OSName=\"linux\" /p:IslinuxPortable=\"true\""
- args=( "${args[@]/$1}" )
+ CUSTOM_BUILD_ARGS="/p:OSName=\"linux\" /p:IslinuxPortable=\"true\""
+ ;;
+ --stage0)
+ STAGE0_SOURCE_DIR=$2
+ shift
;;
--help)
- echo "Usage: $0 [--configuration ] [--targets ] [--skip-prereqs] [--nopackage] [--docker ] [--help]"
+ echo "Usage: $0 [--configuration ] [--architecture ] [--skip-prereqs] [--nopackage] [--nobuild ] [--docker ] [--stage0 ] [--help]"
echo ""
echo "Options:"
echo " --configuration Build the specified Configuration (Debug or Release, default: Debug)"
+ echo " --architecture Build the specified architecture (x64, arm or arm64 , default: x64)"
echo " --skip-prereqs Skip checks for pre-reqs in dotnet_install"
echo " --nopackage Skip packaging targets"
echo " --nobuild Skip building, showing the command that would be used to build"
echo " --docker Build in Docker using the Dockerfile located in scripts/docker/IMAGENAME"
- echo " --linux-portable Builds the Linux portable .NET Tools instead of a distro-specific version."
+ echo " --stage0 Set the stage0 source directory. The default is to download it from Azure."
echo " --help Display this help message"
exit 0
;;
*)
+ args=$@
break
;;
esac
@@ -128,17 +125,22 @@ while [[ $# > 0 ]]; do
shift
done
-# $args array may have empty elements in it.
-# The easiest way to remove them is to cast to string and back to array.
-# This will actually break quoted arguments, arguments like
-# -test "hello world" will be broken into three arguments instead of two, as it should.
-temp="${args[@]}"
-args=($temp)
+# The first 'pass' call to "dotnet msbuild build.proj" has a hard-coded "WriteDynamicPropsToStaticPropsFiles" target
+# therefore, this call should not have other targets defined. Remove all targets passed in as 'extra parameters'.
+argsnotargets=( )
+for arg in ${args[@]}
+do
+ arglower="$(echo $arg | awk '{print tolower($0)}')"
+ if [[ $arglower != '/t:'* ]] && [[ $arglower != '/target:'* ]]; then
+ argsnotargets+=($arg)
+ fi
+done
# Create an install directory for the stage 0 CLI
[ -z "$DOTNET_INSTALL_DIR" ] && export DOTNET_INSTALL_DIR=$REPOROOT/.dotnet_stage0/$ARCHITECTURE
[ -d "$DOTNET_INSTALL_DIR" ] || mkdir -p $DOTNET_INSTALL_DIR
+# Disable first run since we want to control all package sources
export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
# Enable verbose VS Test Console logging
@@ -149,19 +151,28 @@ export VSTEST_TRACE_BUILD=1
# Don't resolve shared frameworks from user or global locations
export DOTNET_MULTILEVEL_LOOKUP=0
-# Install a stage 0
-if [ -z "$DOTNET_TOOL_DIR" ]; then
- curl -sSL "https://dot.net/v1/dotnet-install.sh" | bash /dev/stdin --channel "release/2.0.0" --install-dir "$DOTNET_INSTALL_DIR" --architecture "$ARCHITECTURE" $LINUX_PORTABLE_INSTALL_ARGS
+# Turn off MSBuild Node re-use
+export MSBUILDDISABLENODEREUSE=1
- EXIT_CODE=$?
- if [ $EXIT_CODE != 0 ]; then
- echo "run-build: Error: installing stage0 with exit code $EXIT_CODE." >&2
- exit $EXIT_CODE
- fi
-else
- cp -r $DOTNET_TOOL_DIR/* $DOTNET_INSTALL_DIR/
+# Install a stage 0
+INSTALL_ARCHITECTURE=$ARCHITECTURE
+archlower="$(echo $ARCHITECTURE | awk '{print tolower($0)}')"
+if [[ $archlower == 'arm'* ]]; then
+ INSTALL_ARCHITECTURE="x64"
fi
+if [ "$STAGE0_SOURCE_DIR" == "" ]; then
+ (set -x ; curl -sSL "https://dot.net/v1/dotnet-install.sh" | bash /dev/stdin --version "2.2.0-preview1-007799" --install-dir "$DOTNET_INSTALL_DIR" --architecture "$INSTALL_ARCHITECTURE" $LINUX_PORTABLE_INSTALL_ARGS)
+else
+ echo "Copying bootstrap cli from $STAGE0_SOURCE_DIR"
+ cp -r $STAGE0_SOURCE_DIR/* "$DOTNET_INSTALL_DIR"
+fi
+
+EXIT_CODE=$?
+if [ $EXIT_CODE != 0 ]; then
+ echo "run-build: Error: installing stage0 with exit code $EXIT_CODE." >&2
+ exit $EXIT_CODE
+fi
# Put stage 0 on the PATH (for this shell only)
PATH="$DOTNET_INSTALL_DIR:$PATH"
@@ -177,12 +188,10 @@ fi
# Disable first run since we want to control all package sources
export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
-echo "${args[@]}"
-
if [ $BUILD -eq 1 ]; then
- dotnet msbuild build.proj /p:Architecture=$ARCHITECTURE $CUSTOM_BUILD_ARGS /p:GeneratePropsFile=true /t:WriteDynamicPropsToStaticPropsFiles
- dotnet msbuild build.proj /m /v:normal /fl /flp:v=diag /p:Architecture=$ARCHITECTURE $CUSTOM_BUILD_ARGS "${args[@]}"
+ dotnet msbuild build.proj /p:Architecture=$ARCHITECTURE $CUSTOM_BUILD_ARGS /p:GeneratePropsFile=true /t:WriteDynamicPropsToStaticPropsFiles ${argsnotargets[@]}
+ dotnet msbuild build.proj /m /v:normal /fl /flp:v=diag /p:Architecture=$ARCHITECTURE $CUSTOM_BUILD_ARGS $args
else
echo "Not building due to --nobuild"
- echo "Command that would be run is: 'dotnet msbuild build.proj /m /p:Architecture=$ARCHITECTURE $CUSTOM_BUILD_ARGS ${args[@]}'"
+ echo "Command that would be run is: 'dotnet msbuild build.proj /m /p:Architecture=$ARCHITECTURE $CUSTOM_BUILD_ARGS $args'"
fi
diff --git a/scripts/cli-build-env.bat b/scripts/cli-build-env.bat
new file mode 100644
index 000000000..03b6ded6f
--- /dev/null
+++ b/scripts/cli-build-env.bat
@@ -0,0 +1,17 @@
+@echo off
+REM Copyright (c) .NET Foundation and contributors. All rights reserved.
+REM Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+REM Get normalized version of parent path
+for %%i in (%~dp0..\) DO (
+ SET CLI_REPO_ROOT=%%~dpi
+)
+
+title CLI Build (%CLI_REPO_ROOT%)
+
+REM Add Stage 0 CLI to path
+set PATH=%CLI_REPO_ROOT%.dotnet_stage0\x64;%PATH%
+
+set DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
+set DOTNET_MULTILEVEL_LOOKUP=0
+set NUGET_PACKAGES=%CLI_REPO_ROOT%.nuget\packages
\ No newline at end of file
diff --git a/scripts/dev-dotnet.sh b/scripts/cli-build-env.sh
old mode 100755
new mode 100644
similarity index 68%
rename from scripts/dev-dotnet.sh
rename to scripts/cli-build-env.sh
index e7d8e6eac..1534aeb66
--- a/scripts/dev-dotnet.sh
+++ b/scripts/cli-build-env.sh
@@ -4,22 +4,20 @@
# Licensed under the MIT license. See LICENSE file in the project root for full license information.
#
-set -e
-
SOURCE="${BASH_SOURCE[0]}"
while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
SOURCE="$(readlink "$SOURCE")"
[[ "$SOURCE" != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
done
-DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
-source "$DIR/common/_common.sh"
+REPO_ROOT="$( cd -P "$( dirname "$SOURCE" )/../" && pwd )"
-if [ -d "$STAGE2_DIR" ]; then
- PATH=$STAGE2_DIR/bin:$PATH
- dotnet "$@"
-else
- echo "You don't have a dev build!" 1>&2
- exit 1
-fi
+STAGE0_DIR=$REPO_ROOT/.dotnet_stage0/x64
+export PATH=$STAGE0_DIR:$PATH
+
+
+export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
+export DOTNET_MULTILEVEL_LOOKUP=0
+
+export NUGET_PACKAGES=$REPO_ROOT/.nuget/packages
diff --git a/scripts/cli-test-env.bat b/scripts/cli-test-env.bat
new file mode 100644
index 000000000..0fd84c053
--- /dev/null
+++ b/scripts/cli-test-env.bat
@@ -0,0 +1,20 @@
+@echo off
+REM Copyright (c) .NET Foundation and contributors. All rights reserved.
+REM Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+REM Get normalized version of parent path
+for %%i in (%~dp0..\) DO (
+ SET CLI_REPO_ROOT=%%~dpi
+)
+
+title CLI Test (%CLI_REPO_ROOT%)
+
+REM Add Stage 2 CLI to path
+set PATH=%CLI_REPO_ROOT%bin\2\win-x64\dotnet;%PATH%
+
+set DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
+set DOTNET_MULTILEVEL_LOOKUP=0
+set NUGET_PACKAGES=%CLI_REPO_ROOT%.nuget\packages
+set TEST_PACKAGES=%CLI_REPO_ROOT%bin\2\win-x64\test\packages
+set TEST_ARTIFACTS=%CLI_REPO_ROOT%bin\2\win-x64\test\artifacts
+set PreviousStageProps=%CLI_REPO_ROOT%bin\2\win-x64\PreviousStage.props
diff --git a/scripts/cli-test-env.sh b/scripts/cli-test-env.sh
new file mode 100755
index 000000000..556e032f7
--- /dev/null
+++ b/scripts/cli-test-env.sh
@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) .NET Foundation and contributors. All rights reserved.
+# Licensed under the MIT license. See LICENSE file in the project root for full license information.
+#
+
+SOURCE="${BASH_SOURCE[0]}"
+while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
+ DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
+ SOURCE="$(readlink "$SOURCE")"
+ [[ "$SOURCE" != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
+done
+
+REPO_ROOT="$( cd -P "$( dirname "$SOURCE" )/../" && pwd )"
+
+uname=$(uname)
+if [ "$(uname)" = "Darwin" ]
+then
+ RID=osx-x64
+else
+ RID=linux-x64
+fi
+
+STAGE2_DIR=$REPO_ROOT/bin/2/$RID/dotnet
+export PATH=$STAGE2_DIR:$PATH
+
+
+export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
+export DOTNET_MULTILEVEL_LOOKUP=0
+
+export NUGET_PACKAGES=$REPO_ROOT/.nuget/packages
+export TEST_PACKAGES=$REPO_ROOT/bin/2/$RID/test/packages
+export TEST_ARTIFACTS=$REPO_ROOT/bin/2/$RID/test/artifacts
+export PreviousStageProps=$REPO_ROOT/bin/2/$RID/PreviousStage.props
diff --git a/scripts/dev-dotnet.ps1 b/scripts/dev-dotnet.ps1
deleted file mode 100644
index afcfe46d5..000000000
--- a/scripts/dev-dotnet.ps1
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Copyright (c) .NET Foundation and contributors. All rights reserved.
-# Licensed under the MIT license. See LICENSE file in the project root for full license information.
-#
-
-$oldPath = $env:PATH
-try {
- # Put the stage2 output on the front of the path
- if(!(Get-Command dotnet -ErrorAction SilentlyContinue)) {
- throw "You need to have a version of 'dotnet' on your path so we can determine the RID"
- }
-
- $rid = dotnet --version | where { $_ -match "^ Runtime Id:\s*(.*)$" } | foreach { $matches[1] }
- $stage2 = "$PSScriptRoot\..\artifacts\$rid\stage2\bin"
- if (Test-Path $stage2) {
- $env:PATH="$stage2;$env:PATH"
- } else {
- Write-Output "You don't have a dev build in the 'artifacts\$rid\stage2' folder!"
- }
-
- dotnet @args
-} finally {
- $env:PATH = $oldPath
-}
diff --git a/scripts/docker/alpine.3.6/Dockerfile b/scripts/docker/alpine.3.6/Dockerfile
new file mode 100644
index 000000000..746f1bd4b
--- /dev/null
+++ b/scripts/docker/alpine.3.6/Dockerfile
@@ -0,0 +1,15 @@
+#
+# Copyright (c) .NET Foundation and contributors. All rights reserved.
+# Licensed under the MIT license. See LICENSE file in the project root for full license information.
+#
+
+# Dockerfile that creates a container suitable to build dotnet-cli
+FROM microsoft/dotnet-buildtools-prereqs:alpine-3.6-3148f11-20171119021156
+
+# This Dockerfile doesn't use the USER_ID, but the parameter needs to be declared to prevent docker
+# from issuing a warning
+ARG USER_ID=0
+
+# Set working directory
+WORKDIR /opt/code
+
diff --git a/scripts/docker/fedora.27/Dockerfile b/scripts/docker/fedora.27/Dockerfile
new file mode 100644
index 000000000..e0f6e851d
--- /dev/null
+++ b/scripts/docker/fedora.27/Dockerfile
@@ -0,0 +1,32 @@
+#
+# Copyright (c) .NET Foundation and contributors. All rights reserved.
+# Licensed under the MIT license. See LICENSE file in the project root for full license information.
+#
+
+# Dockerfile that creates a container suitable to build dotnet-cli
+FROM microsoft/dotnet-buildtools-prereqs:fedora-27-82a3800-20180326211504
+
+RUN dnf install -y findutils
+
+RUN dnf upgrade -y nss
+
+RUN dnf clean all
+
+# Set a different rid to publish buildtools for, until we update to a version which
+# natively supports fedora.24-x64
+ENV __PUBLISH_RID=fedora.23-x64
+
+# Setup User to match Host User, and give superuser permissions
+ARG USER_ID=0
+RUN useradd -m code_executor -u ${USER_ID} -g wheel
+RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
+
+# With the User Change, we need to change permissions on these directories
+RUN chmod -R a+rwx /usr/local
+RUN chmod -R a+rwx /home
+
+# Set user to the one we just created
+USER ${USER_ID}
+
+# Set working directory
+WORKDIR /opt/code
\ No newline at end of file
diff --git a/scripts/docker/opensuse.43.2/Dockerfile b/scripts/docker/opensuse.43.2/Dockerfile
new file mode 100644
index 000000000..b128f8bc9
--- /dev/null
+++ b/scripts/docker/opensuse.43.2/Dockerfile
@@ -0,0 +1,49 @@
+#
+# Copyright (c) .NET Foundation and contributors. All rights reserved.
+# Licensed under the MIT license. See LICENSE file in the project root for full license information.
+#
+
+FROM microsoft/dotnet-buildtools-prereqs:opensuse-42.3-d46ee12-20180327014902
+
+# Install the base toolchain we need to build anything (clang, cmake, make and the like)
+# this does not include libraries that we need to compile different projects, we'd like
+# them in a different layer.
+RUN zypper -n install binutils \
+ cmake \
+ which \
+ gcc \
+ llvm-clang \
+ tar \
+ ncurses-utils \
+ curl \
+ git \
+ sudo && \
+ zypper clean -a
+
+# Dependencies of CoreCLR and CoreFX.
+
+RUN zypper -n install --force-resolution \
+ libunwind \
+ libicu \
+ lttng-ust \
+ libuuid1 \
+ libopenssl1_0_0 \
+ libcurl4 \
+ krb5 && \
+ zypper clean -a
+
+# Setup User to match Host User, and give superuser permissions
+ARG USER_ID=0
+RUN useradd -m code_executor -u ${USER_ID} -g wheel
+RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
+
+# With the User Change, we need to change permissions on these directories
+RUN chmod -R a+rwx /usr/local
+RUN chmod -R a+rwx /home
+RUN chmod -R 755 /usr/lib/sudo
+
+# Set user to the one we just created
+USER ${USER_ID}
+
+# Set working directory
+WORKDIR /opt/code
\ No newline at end of file
diff --git a/scripts/docker/rhel.6/Dockerfile b/scripts/docker/rhel.6/Dockerfile
new file mode 100644
index 000000000..1275f3293
--- /dev/null
+++ b/scripts/docker/rhel.6/Dockerfile
@@ -0,0 +1,31 @@
+#
+# Copyright (c) .NET Foundation and contributors. All rights reserved.
+# Licensed under the MIT license. See LICENSE file in the project root for full license information.
+#
+
+# Dockerfile that creates a container suitable to build dotnet-cli
+FROM microsoft/dotnet-buildtools-prereqs:centos-6-376e1a3-20174311014331
+
+# yum doesn't work with the special curl version we have in the base docker image,
+# so we remove /usr/local/lib from the library path for this command
+RUN yum -q -y install sudo
+
+# Setup User to match Host User, and give superuser permissions
+ARG USER_ID=0
+RUN useradd -m code_executor -u ${USER_ID} -g root
+RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
+
+# With the User Change, we need to change permssions on these directories
+RUN chmod -R a+rwx /usr/local
+RUN chmod -R a+rwx /home
+RUN chmod -R 755 /usr/bin/sudo
+
+# Set user to the one we just created
+USER ${USER_ID}
+
+# Set library path to make CURL and ICU libraries that are in /usr/local/lib visible
+ENV LD_LIBRARY_PATH /usr/local/lib
+
+# Set working directory
+WORKDIR /opt/code
+
diff --git a/scripts/docker/rhel/Dockerfile b/scripts/docker/rhel/Dockerfile
index 17ad16cf5..ec809ea73 100644
--- a/scripts/docker/rhel/Dockerfile
+++ b/scripts/docker/rhel/Dockerfile
@@ -4,11 +4,7 @@
#
# Dockerfile that creates a container suitable to build dotnet-cli
-FROM microsoft/dotnet-buildtools-prereqs:rhel-7-rpmpkg-c982313-20174116044113
-
-# Install from sudo main package TODO This package needs to be mirrored
-RUN yum install -y https://www.sudo.ws/sudo/dist/packages/RHEL/7/sudo-1.8.20-3.el7.x86_64.rpm \
- && yum clean all
+FROM microsoft/dotnet-buildtools-prereqs:rhel-7-rpmpkg-e1b4a89-20175311035359
# Setup User to match Host User, and give superuser permissions
ARG USER_ID=0
diff --git a/scripts/docker/ubuntu.18.04/Dockerfile b/scripts/docker/ubuntu.18.04/Dockerfile
new file mode 100644
index 000000000..97d0578c7
--- /dev/null
+++ b/scripts/docker/ubuntu.18.04/Dockerfile
@@ -0,0 +1,29 @@
+#
+# Copyright (c) .NET Foundation and contributors. All rights reserved.
+# Licensed under the MIT license. See LICENSE file in the project root for full license information.
+#
+
+# Dockerfile that creates a container suitable to build dotnet-cli
+FROM microsoft/dotnet-buildtools-prereqs:ubuntu-18.04-f90bc20-20180320154721
+
+RUN apt-get update && \
+ apt-get -qqy install \
+ sudo && \
+ apt-get clean && \
+ rm -rf /var/lib/apt/lists/*
+
+# Setup User to match Host User, and give superuser permissions
+ARG USER_ID=0
+RUN useradd -m code_executor -u ${USER_ID} -g sudo
+RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
+
+# With the User Change, we need to change permissions on these directories
+RUN chmod -R a+rwx /usr/local
+RUN chmod -R a+rwx /home
+RUN chmod -R 755 /usr/lib/sudo
+
+# Set user to the one we just created
+USER ${USER_ID}
+
+# Set working directory
+WORKDIR /opt/code
\ No newline at end of file
diff --git a/scripts/dockerrun.sh b/scripts/dockerrun.sh
index abdaec636..1ffd92ee6 100755
--- a/scripts/dockerrun.sh
+++ b/scripts/dockerrun.sh
@@ -115,36 +115,31 @@ echo "Running command: $BUILD_COMMAND"
echo "Using code from: $DOCKER_HOST_SHARE_DIR"
[ -z "$INTERACTIVE" ] || echo "Running Interactive"
+# Note: passwords/keys should not be passed in the environment
docker run $INTERACTIVE -t --rm --sig-proxy=true \
--name $DOTNET_BUILD_CONTAINER_NAME \
-v $DOCKER_HOST_SHARE_DIR:/opt/code \
-e CHANNEL \
- -e CONNECTION_STRING \
- -e REPO_ID \
- -e REPO_USER \
- -e REPO_PASS \
- -e REPO_SERVER \
-e DOTNET_BUILD_SKIP_CROSSGEN \
-e PUBLISH_TO_AZURE_BLOB \
-e NUGET_FEED_URL \
-e NUGET_API_KEY \
- -e GITHUB_PASSWORD \
- -e ARTIFACT_STORAGE_KEY \
-e ARTIFACT_STORAGE_ACCOUNT \
-e ARTIFACT_STORAGE_CONTAINER \
- -e CHECKSUM_STORAGE_KEY \
-e CHECKSUM_STORAGE_ACCOUNT \
-e CHECKSUM_STORAGE_CONTAINER \
+ -e BLOBFEED_STORAGE_CONTAINER \
-e CLIBUILD_SKIP_TESTS \
-e COMMITCOUNT \
-e DROPSUFFIX \
-e RELEASESUFFIX \
-e COREFXAZURECONTAINER \
-e AZUREACCOUNTNAME \
- -e AZUREACCESSTOKEN \
- -e VSOPASSWORD \
-e RELEASETOOLSGITURL \
-e CORESETUPBLOBROOTURL \
- -e CORESETUPBLOBACCESSTOKEN \
+ -e PB_ASSETROOTURL \
+ -e PB_PACKAGEVERSIONPROPSURL \
+ -e PB_PUBLISHBLOBFEEDURL \
+ -e EXTERNALRESTORESOURCES \
$DOTNET_BUILD_CONTAINER_TAG \
$BUILD_COMMAND "$@"
diff --git a/scripts/unuse-dev.ps1 b/scripts/unuse-dev.ps1
deleted file mode 100644
index fbf5f4c18..000000000
--- a/scripts/unuse-dev.ps1
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# Copyright (c) .NET Foundation and contributors. All rights reserved.
-# Licensed under the MIT license. See LICENSE file in the project root for full license information.
-#
-
-# Remove the stage2 output from the path
-$splat = $env:PATH.Split(";")
-$stripped = @($splat | where { $_ -notlike "*artifacts\win7-x64\stage2*" })
-$env:PATH = [string]::Join(";", $stripped)
diff --git a/scripts/use-dev.ps1 b/scripts/use-dev.ps1
deleted file mode 100644
index 1d7225bd6..000000000
--- a/scripts/use-dev.ps1
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Copyright (c) .NET Foundation and contributors. All rights reserved.
-# Licensed under the MIT license. See LICENSE file in the project root for full license information.
-#
-
-# Put the stage2 output on the front of the path
-$stage2 = "$PSScriptRoot\..\artifacts\win10-x64\stage2"
-if (Test-Path $stage2) {
- $splat = $env:PATH.Split(";")
- $stage2 = Convert-Path $stage2
- if ($splat -notcontains $stage2) {
- $env:PATH="$stage2;$env:PATH"
- }
-} else {
- Write-Output "You don't have a dev build in the 'artifacts\win10-x64\stage2' folder!"
-}
diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj
new file mode 100644
index 000000000..9261c166c
--- /dev/null
+++ b/src/redist/redist.csproj
@@ -0,0 +1,264 @@
+
+
+
+
+
+
+ $(CliTargetFramework)
+ true
+ false
+ dotnet5.4
+ $(SdkOutputDirectory)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ DotnetToolsLayoutDirectory=$(SdkOutputDirectory)/DotnetTools;
+ TemplateFillInPackageName=%(BundledDotnetTools.Identity);
+ TemplateFillInPackageVersion=%(BundledDotnetTools.Version);
+ PreviousStageDirectory=$(PreviousStageDirectory)
+
+
+
+
+
+
+
+
+
+
+
+ Microsoft.NETCore.DotNetAppHost
+
+
+
+
+
+
+
+
+
+ <_NETCoreDotNetAppHostPackageVersion>@(NETCoreDotNetAppHostPackageVersions->Distinct())
+
+
+
+
+
+ AppHostTemplatePath=$(SdkOutputDirectory)/AppHostTemplate;
+ TemplateFillInPackageName=$(NETCoreDotNetAppHostPackageName);
+ TemplateFillInPackageVersion=$(_NETCoreDotNetAppHostPackageVersion);
+ PreviousStageDirectory=$(PreviousStageDirectory);
+ AppHostIntermediateDirectory=$(IntermediateDirectory)/AppHostIntermediate
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ TemplateLayoutDirectory=$(SdkOutputDirectory)/Templates;
+ TemplateFillInPackageName=%(BundledTemplate.Identity);
+ TemplateFillInPackageVersion=%(BundledTemplate.Version);
+ PreviousStageDirectory=$(PreviousStageDirectory)
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(PublishDir)/vstest.console.runtimeconfig.json
+ "version": ".*"
+ "version": "$(MicrosoftNETCoreAppPackageVersion)"
+
+
+
+
diff --git a/test/EndToEnd/EndToEnd.csproj b/test/EndToEnd/EndToEnd.csproj
index 5c441480f..2cfa51620 100644
--- a/test/EndToEnd/EndToEnd.csproj
+++ b/test/EndToEnd/EndToEnd.csproj
@@ -1,7 +1,7 @@
$(CliTargetFramework)
- $(CLI_SharedFrameworkVersion)
+ $(MicrosoftNETCoreAppPackageVersion)EndToEndExe$(AssetTargetFallback);dotnet5.4;portable-net451+win8
@@ -19,10 +19,9 @@
-
+
-
-
+
diff --git a/test/EndToEnd/GivenAspNetAppsResolveImplicitVersions.cs b/test/EndToEnd/GivenAspNetAppsResolveImplicitVersions.cs
new file mode 100644
index 000000000..da7163646
--- /dev/null
+++ b/test/EndToEnd/GivenAspNetAppsResolveImplicitVersions.cs
@@ -0,0 +1,222 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Xml.Linq;
+using FluentAssertions;
+using Microsoft.DotNet.TestFramework;
+using Microsoft.DotNet.Tools.Test.Utilities;
+using NuGet.ProjectModel;
+using NuGet.Versioning;
+using Xunit;
+
+namespace EndToEnd
+{
+ public class GivenAspNetAppsResolveImplicitVersions : TestBase
+ {
+ private const string AspNetTestProject = "TestWebAppSimple";
+
+ [Fact]
+ public void PortablePublishWithLatestTFMUsesBundledAspNetCoreAppVersion()
+ {
+ var _testInstance = TestAssets.Get(AspNetTestProject)
+ .CreateInstance(identifier: LatestSupportedAspNetCoreAppVersion)
+ .WithSourceFiles();
+
+ string projectDirectory = _testInstance.Root.FullName;
+ string projectPath = Path.Combine(projectDirectory, $"{AspNetTestProject}.csproj");
+
+ var project = XDocument.Load(projectPath);
+ var ns = project.Root.Name.Namespace;
+
+ // Update TargetFramework to the right version of .NET Core
+ project.Root.Element(ns + "PropertyGroup")
+ .Element(ns + "TargetFramework")
+ .Value = "netcoreapp" + LatestSupportedAspNetCoreAppVersion;
+
+ project.Save(projectPath);
+
+ // Get the implicit version
+ new RestoreCommand()
+ .WithWorkingDirectory(projectDirectory)
+ .Execute()
+ .Should().Pass();
+
+ var assetsFilePath = Path.Combine(projectDirectory, "obj", "project.assets.json");
+ var assetsFile = new LockFileFormat().Read(assetsFilePath);
+
+ var restoredVersion = GetAspNetCoreAppVersion(assetsFile, portable: true);
+ restoredVersion.Should().NotBeNull();
+
+ var bundledVersionPath = Path.Combine(projectDirectory, ".BundledAspNetCoreVersion");
+ var bundledVersion = File.ReadAllText(bundledVersionPath).Trim();
+
+ restoredVersion.ToNormalizedString().Should().BeEquivalentTo(bundledVersion,
+ "The bundled aspnetcore versions set in Microsoft.NETCoreSdk.BundledVersions.props should be idenitical to the versions set in DependencyVersions.props." +
+ "Please update MSBuildExtensions.targets in this repo so these versions match.");
+ }
+
+ [Fact]
+ public void StandalonePublishWithLatestTFMUsesBundledAspNetCoreAppVersion()
+ {
+ var _testInstance = TestAssets.Get(AspNetTestProject)
+ .CreateInstance(identifier: LatestSupportedAspNetCoreAppVersion)
+ .WithSourceFiles();
+
+ string projectDirectory = _testInstance.Root.FullName;
+ string projectPath = Path.Combine(projectDirectory, $"{AspNetTestProject}.csproj");
+
+ var project = XDocument.Load(projectPath);
+ var ns = project.Root.Name.Namespace;
+
+ // Update TargetFramework to the right version of .NET Core
+ project.Root.Element(ns + "PropertyGroup")
+ .Element(ns + "TargetFramework")
+ .Value = "netcoreapp" + LatestSupportedAspNetCoreAppVersion;
+
+ var rid = Microsoft.DotNet.PlatformAbstractions.RuntimeEnvironment.GetRuntimeIdentifier();
+
+ // Set RuntimeIdentifier to simulate standalone publish
+ project.Root.Element(ns + "PropertyGroup")
+ .Add(new XElement(ns + "RuntimeIdentifier", rid));
+
+ project.Save(projectPath);
+
+ // Get the implicit version
+ new RestoreCommand()
+ .WithWorkingDirectory(projectDirectory)
+ .Execute()
+ .Should().Pass();
+
+ var assetsFilePath = Path.Combine(projectDirectory, "obj", "project.assets.json");
+ var assetsFile = new LockFileFormat().Read(assetsFilePath);
+
+ var restoredVersion = GetAspNetCoreAppVersion(assetsFile);
+ restoredVersion.Should().NotBeNull();
+
+ var bundledVersionPath = Path.Combine(projectDirectory, ".BundledAspNetCoreVersion");
+ var bundledVersion = File.ReadAllText(bundledVersionPath).Trim();
+
+ restoredVersion.ToNormalizedString().Should().BeEquivalentTo(bundledVersion,
+ "The bundled aspnetcore versions set in Microsoft.NETCoreSdk.BundledVersions.props should be idenitical to the versions set in DependencyVersions.props." +
+ "Please update MSBuildExtensions.targets in this repo so these versions match.");
+ }
+
+ [Theory]
+ [MemberData(nameof(SupportedAspNetCoreAppVersions))]
+ public void ItRollsForwardToTheLatestVersion(string minorVersion)
+ {
+ var _testInstance = TestAssets.Get(AspNetTestProject)
+ .CreateInstance(identifier: minorVersion)
+ .WithSourceFiles();
+
+ string projectDirectory = _testInstance.Root.FullName;
+
+ string projectPath = Path.Combine(projectDirectory, $"{AspNetTestProject}.csproj");
+
+ var project = XDocument.Load(projectPath);
+ var ns = project.Root.Name.Namespace;
+
+ // Update TargetFramework to the right version of .NET Core
+ project.Root.Element(ns + "PropertyGroup")
+ .Element(ns + "TargetFramework")
+ .Value = "netcoreapp" + minorVersion;
+
+ var rid = Microsoft.DotNet.PlatformAbstractions.RuntimeEnvironment.GetRuntimeIdentifier();
+
+ // Set RuntimeIdentifier to opt in to roll-forward behavior
+ project.Root.Element(ns + "PropertyGroup")
+ .Add(new XElement(ns + "RuntimeIdentifier", rid));
+
+ project.Save(projectPath);
+
+ // Get the version rolled forward to
+ new RestoreCommand()
+ .WithWorkingDirectory(projectDirectory)
+ .Execute()
+ .Should().Pass();
+
+ string assetsFilePath = Path.Combine(projectDirectory, "obj", "project.assets.json");
+ var assetsFile = new LockFileFormat().Read(assetsFilePath);
+
+ var rolledForwardVersion = GetAspNetCoreAppVersion(assetsFile);
+ rolledForwardVersion.Should().NotBeNull();
+
+ if (rolledForwardVersion.IsPrerelease)
+ {
+ // If this version of .NET Core is still prerelease, then:
+ // - Floating the patch by adding ".*" to the major.minor version won't work, but
+ // - There aren't any patches to roll-forward to, so we skip testing this until the version
+ // leaves prerelease.
+ return;
+ }
+
+ // Float the RuntimeFrameworkVersion to get the latest version of the runtime available from feeds
+ Directory.Delete(Path.Combine(projectDirectory, "obj"), true);
+ project.Root.Element(ns + "PropertyGroup")
+ .Add(new XElement(ns + "RuntimeFrameworkVersion", $"{minorVersion}.*"));
+ project.Save(projectPath);
+
+ new RestoreCommand()
+ .WithWorkingDirectory(projectDirectory)
+ .Execute()
+ .Should().Pass();
+
+ var floatedAssetsFile = new LockFileFormat().Read(assetsFilePath);
+
+ var floatedVersion = GetAspNetCoreAppVersion(floatedAssetsFile);
+ floatedVersion.Should().NotBeNull();
+
+ rolledForwardVersion.ToNormalizedString().Should().BeEquivalentTo(floatedVersion.ToNormalizedString(),
+ "the latest patch version properties in Microsoft.NETCoreSdk.BundledVersions.props need to be updated " +
+ "(see MSBuildExtensions.targets in this repo)");
+ }
+
+ [Fact]
+ public void WeCoverLatestAspNetCoreAppRollForward()
+ {
+ // Run "dotnet new web", get TargetFramework property, and make sure it's covered in SupportedAspNetCoreAppVersions
+ using (DisposableDirectory directory = Temp.CreateDirectory())
+ {
+ string projectDirectory = directory.Path;
+
+ new NewCommandShim()
+ .WithWorkingDirectory(projectDirectory)
+ .Execute("web --no-restore")
+ .Should().Pass();
+
+ string projectPath = Path.Combine(projectDirectory, Path.GetFileName(projectDirectory) + ".csproj");
+
+ var project = XDocument.Load(projectPath);
+ var ns = project.Root.Name.Namespace;
+
+ string targetFramework = project.Root.Element(ns + "PropertyGroup")
+ .Element(ns + "TargetFramework")
+ .Value;
+
+ SupportedAspNetCoreAppVersions.Select(v => $"netcoreapp{v[0]}")
+ .Should().Contain(targetFramework, $"the {nameof(SupportedAspNetCoreAppVersions)} property should include the default version " +
+ "of Microsoft.AspNetCore.App used by the templates created by \"dotnet new web\"");
+
+ }
+ }
+
+ private NuGetVersion GetAspNetCoreAppVersion(LockFile lockFile, bool portable = false)
+ {
+ return lockFile?.Targets?.SingleOrDefault(t => portable || t.RuntimeIdentifier != null)
+ ?.Libraries?.SingleOrDefault(l =>
+ string.Compare(l.Name, "Microsoft.AspNetCore.App", StringComparison.CurrentCultureIgnoreCase) == 0)
+ ?.Version;
+ }
+
+ public static string LatestSupportedAspNetCoreAppVersion = "2.2";
+
+ public static IEnumerable SupportedAspNetCoreAppVersions
+ {
+ get
+ {
+ yield return new object[] { LatestSupportedAspNetCoreAppVersion };
+ }
+ }
+ }
+}
diff --git a/test/EndToEnd/GivenDotNetLinuxInstallers.cs b/test/EndToEnd/GivenDotNetLinuxInstallers.cs
new file mode 100644
index 000000000..4968f0221
--- /dev/null
+++ b/test/EndToEnd/GivenDotNetLinuxInstallers.cs
@@ -0,0 +1,83 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.IO;
+using Microsoft.DotNet.Tools.Test.Utilities;
+using Xunit;
+
+namespace Microsoft.DotNet.Tests.EndToEnd
+{
+ public class GivenDotNetLinuxInstallers
+ {
+ [Fact]
+ public void ItHasExpectedDependencies()
+ {
+ var installerFile = Environment.GetEnvironmentVariable("SDK_INSTALLER_FILE");
+ if (string.IsNullOrEmpty(installerFile))
+ {
+ return;
+ }
+
+ var ext = Path.GetExtension(installerFile);
+ switch (ext)
+ {
+ case ".deb":
+ DebianPackageHasDependencyOnAspNetCoreStoreAndDotnetRuntime(installerFile);
+ return;
+ case ".rpm":
+ RpmPackageHasDependencyOnAspNetCoreStoreAndDotnetRuntime(installerFile);
+ return;
+ }
+ }
+
+ private void DebianPackageHasDependencyOnAspNetCoreStoreAndDotnetRuntime(string installerFile)
+ {
+ // Example output:
+
+ // $ dpkg --info dotnet-sdk-2.1.105-ubuntu-x64.deb
+
+ // new debian package, version 2.0.
+ // size 75660448 bytes: control archive=29107 bytes.
+ // 717 bytes, 11 lines control
+ // 123707 bytes, 1004 lines md5sums
+ // 1710 bytes, 28 lines * postinst #!/usr/bin/env
+ // Package: dotnet-sdk-2.1.104
+ // Version: 2.1.104-1
+ // Architecture: amd64
+ // Maintainer: Microsoft
+ // Installed-Size: 201119
+ // Depends: dotnet-runtime-2.0.6, aspnetcore-store-2.0.6
+ // Section: devel
+ // Priority: standard
+ // Homepage: https://dotnet.github.io/core
+ // Description: Microsoft .NET Core SDK - 2.1.104
+
+ new TestCommand("dpkg")
+ .ExecuteWithCapturedOutput($"--info {installerFile}")
+ .Should().Pass()
+ .And.HaveStdOutMatching(@"Depends:.*\s?dotnet-runtime-\d+(\.\d+){2}")
+ .And.HaveStdOutMatching(@"Depends:.*\s?aspnetcore-store-\d+(\.\d+){2}");
+ }
+
+ private void RpmPackageHasDependencyOnAspNetCoreStoreAndDotnetRuntime(string installerFile)
+ {
+ // Example output:
+
+ // $ rpm -qpR dotnet-sdk-2.1.105-rhel-x64.rpm
+
+ // dotnet-runtime-2.0.7 >= 2.0.7
+ // aspnetcore-store-2.0.7 >= 2.0.7
+ // /bin/sh
+ // /bin/sh
+ // rpmlib(PayloadFilesHavePrefix) <= 4.0-1
+ // rpmlib(CompressedFileNames) <= 3.0.4-1
+
+ new TestCommand("rpm")
+ .ExecuteWithCapturedOutput($"-qpR {installerFile}")
+ .Should().Pass()
+ .And.HaveStdOutMatching(@"dotnet-runtime-\d+(\.\d+){2} >= \d+(\.\d+){2}")
+ .And.HaveStdOutMatching(@"aspnetcore-store-\d+(\.\d+){2} >= \d+(\.\d+){2}");
+ }
+ }
+}
diff --git a/test/EndToEnd/GivenDotNetUsesMSBuild.cs b/test/EndToEnd/GivenDotNetUsesMSBuild.cs
index 724ffb378..f5def1d95 100644
--- a/test/EndToEnd/GivenDotNetUsesMSBuild.cs
+++ b/test/EndToEnd/GivenDotNetUsesMSBuild.cs
@@ -19,7 +19,7 @@ namespace Microsoft.DotNet.Tests.EndToEnd
{
string projectDirectory = directory.Path;
- string newArgs = "console -f netcoreapp2.0 --debug:ephemeral-hive --no-restore";
+ string newArgs = "console -f netcoreapp2.1 --debug:ephemeral-hive --no-restore";
new NewCommandShim()
.WithWorkingDirectory(projectDirectory)
.Execute(newArgs)
@@ -112,7 +112,7 @@ namespace Microsoft.DotNet.Tests.EndToEnd
new DotnetCommand()
.WithWorkingDirectory(testProjectDirectory)
.ExecuteWithCapturedOutput(
- $"-d dependency-tool-invoker -c {configuration} -f netcoreapp2.0 portable")
+ $"-d dependency-tool-invoker -c {configuration} -f netcoreapp2.2 portable")
.Should().Pass()
.And.HaveStdOutContaining("Hello Portable World!");;
}
diff --git a/test/EndToEnd/GivenDotnetUsesDotnetTools.cs b/test/EndToEnd/GivenDotnetUsesDotnetTools.cs
new file mode 100644
index 000000000..c9b46d6a9
--- /dev/null
+++ b/test/EndToEnd/GivenDotnetUsesDotnetTools.cs
@@ -0,0 +1,17 @@
+using FluentAssertions;
+using Microsoft.DotNet.Tools.Test.Utilities;
+using Xunit;
+
+namespace EndToEnd
+{
+ public class GivenDotnetUsesDotnetTools : TestBase
+ {
+ [Fact]
+ public void ThenOneDotnetToolsCanBeCalled()
+ {
+ new DotnetCommand()
+ .ExecuteWithCapturedOutput("dev-certs --help")
+ .Should().Pass();
+ }
+ }
+}
diff --git a/test/EndToEnd/GivenSelfContainedAppsRollForward.cs b/test/EndToEnd/GivenSelfContainedAppsRollForward.cs
new file mode 100644
index 000000000..080197472
--- /dev/null
+++ b/test/EndToEnd/GivenSelfContainedAppsRollForward.cs
@@ -0,0 +1,142 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Xml.Linq;
+using FluentAssertions;
+using Microsoft.DotNet.TestFramework;
+using Microsoft.DotNet.Tools.Test.Utilities;
+using NuGet.ProjectModel;
+using NuGet.Versioning;
+using Xunit;
+
+namespace EndToEnd
+{
+ public class GivenSelfContainedAppsRollForward : TestBase
+ {
+
+ [Theory(Skip = "Runtime 1.1 support for openSUSE and Fedora 27 needed")]
+ // MemberData is used instead of InlineData here so we can access it in another test to
+ // verify that we are covering the latest release of .NET Core
+ [MemberData(nameof(SupportedNetCoreAppVersions))]
+ public void ItRollsForwardToTheLatestVersion(string minorVersion)
+ {
+ var _testInstance = TestAssets.Get("TestAppSimple")
+ .CreateInstance(identifier: minorVersion)
+ .WithSourceFiles();
+
+ string projectDirectory = _testInstance.Root.FullName;
+
+ string projectPath = Path.Combine(projectDirectory, "TestAppSimple.csproj");
+
+ var project = XDocument.Load(projectPath);
+ var ns = project.Root.Name.Namespace;
+
+ // Update TargetFramework to the right version of .NET Core
+ project.Root.Element(ns + "PropertyGroup")
+ .Element(ns + "TargetFramework")
+ .Value = "netcoreapp" + minorVersion;
+
+ var rid = Microsoft.DotNet.PlatformAbstractions.RuntimeEnvironment.GetRuntimeIdentifier();
+
+ // Set RuntimeIdentifier to opt in to roll-forward behavior
+ project.Root.Element(ns + "PropertyGroup")
+ .Add(new XElement(ns + "RuntimeIdentifier", rid));
+
+ project.Save(projectPath);
+
+ // Get the version rolled forward to
+ new RestoreCommand()
+ .WithWorkingDirectory(projectDirectory)
+ .Execute()
+ .Should().Pass();
+
+ string assetsFilePath = Path.Combine(projectDirectory, "obj", "project.assets.json");
+ var assetsFile = new LockFileFormat().Read(assetsFilePath);
+
+ var rolledForwardVersion = GetNetCoreAppVersion(assetsFile);
+ rolledForwardVersion.Should().NotBeNull();
+
+ if (rolledForwardVersion.IsPrerelease)
+ {
+ // If this version of .NET Core is still prerelease, then:
+ // - Floating the patch by adding ".*" to the major.minor version won't work, but
+ // - There aren't any patches to roll-forward to, so we skip testing this until the version
+ // leaves prerelease.
+ return;
+ }
+
+ // Float the RuntimeFrameworkVersion to get the latest version of the runtime available from feeds
+ Directory.Delete(Path.Combine(projectDirectory, "obj"), true);
+ project.Root.Element(ns + "PropertyGroup")
+ .Add(new XElement(ns + "RuntimeFrameworkVersion", $"{minorVersion}.*"));
+ project.Save(projectPath);
+
+ new RestoreCommand()
+ .WithWorkingDirectory(projectDirectory)
+ .Execute()
+ .Should().Pass();
+
+ var floatedAssetsFile = new LockFileFormat().Read(assetsFilePath);
+
+ var floatedVersion = GetNetCoreAppVersion(floatedAssetsFile);
+ floatedVersion.Should().NotBeNull();
+
+ rolledForwardVersion.ToNormalizedString().Should().BeEquivalentTo(floatedVersion.ToNormalizedString(),
+ "the latest patch version properties in Microsoft.NETCoreSdk.BundledVersions.props need to be updated " +
+ "(see MSBuildExtensions.targets in this repo)");
+ }
+
+ private NuGetVersion GetNetCoreAppVersion(LockFile lockFile)
+ {
+ return lockFile?.Targets?.SingleOrDefault(t => t.RuntimeIdentifier != null)
+ ?.Libraries?.SingleOrDefault(l =>
+ string.Compare(l.Name, "Microsoft.NETCore.App", StringComparison.CurrentCultureIgnoreCase) == 0)
+ ?.Version;
+ }
+
+ [Fact]
+ public void WeCoverLatestNetCoreAppRollForward()
+ {
+ // Run "dotnet new console", get TargetFramework property, and make sure it's covered in SupportedNetCoreAppVersions
+ using (DisposableDirectory directory = Temp.CreateDirectory())
+ {
+ string projectDirectory = directory.Path;
+
+ new NewCommandShim()
+ .WithWorkingDirectory(projectDirectory)
+ .Execute("console --no-restore")
+ .Should().Pass();
+
+ string projectPath = Path.Combine(projectDirectory, Path.GetFileName(projectDirectory) + ".csproj");
+
+ var project = XDocument.Load(projectPath);
+ var ns = project.Root.Name.Namespace;
+
+ string targetFramework = project.Root.Element(ns + "PropertyGroup")
+ .Element(ns + "TargetFramework")
+ .Value;
+
+ SupportedNetCoreAppVersions.Select(v => $"netcoreapp{v[0]}")
+ .Should().Contain(targetFramework, $"the {nameof(SupportedNetCoreAppVersions)} property should include the default version " +
+ "of .NET Core created by \"dotnet new\"");
+
+ }
+ }
+
+ public static IEnumerable SupportedNetCoreAppVersions
+ {
+ get
+ {
+ return new[]
+ {
+ "1.0",
+ "1.1",
+ "2.0",
+ "2.1"
+ }.Select(version => new object[] { version });
+ }
+ }
+ }
+}
diff --git a/test/Microsoft.DotNet.Cli.Tests.sln b/test/Microsoft.DotNet.Cli.Tests.sln
index 16df59a1d..6c9ab9014 100644
--- a/test/Microsoft.DotNet.Cli.Tests.sln
+++ b/test/Microsoft.DotNet.Cli.Tests.sln
@@ -1,8 +1,7 @@
-
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
-VisualStudioVersion = 15.0.26124.0
-MinimumVisualStudioVersion = 15.0.26124.0
+VisualStudioVersion = 15.0.27130.2024
+MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.TestFramework", "Microsoft.DotNet.TestFramework\Microsoft.DotNet.TestFramework.csproj", "{BEA33DFA-8559-4680-B40A-B522FBF37567}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.Tools.Tests.Utilities", "Microsoft.DotNet.Tools.Tests.Utilities\Microsoft.DotNet.Tools.Tests.Utilities.csproj", "{770FE8B9-6381-4328-AA36-D6A21114701E}"
@@ -59,4 +58,7 @@ Global
{AEB7B217-D4C4-46F1-9495-87F869F0ABE4}.Release|x86.ActiveCfg = Release|x86
{AEB7B217-D4C4-46F1-9495-87F869F0ABE4}.Release|x86.Build.0 = Release|x86
EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {7AF6777A-0133-453A-B302-FDD974B8F39C}
+ EndGlobalSection
EndGlobal
diff --git a/test/Microsoft.DotNet.TestFramework/Microsoft.DotNet.TestFramework.csproj b/test/Microsoft.DotNet.TestFramework/Microsoft.DotNet.TestFramework.csproj
index 4d3d8cf67..75dbb31cf 100644
--- a/test/Microsoft.DotNet.TestFramework/Microsoft.DotNet.TestFramework.csproj
+++ b/test/Microsoft.DotNet.TestFramework/Microsoft.DotNet.TestFramework.csproj
@@ -2,14 +2,16 @@
Microsoft.DotNet.TestFramework Class Library
- netstandard1.5
+ $(CliVersionPrefix)
+ netstandard2.0../../tools/Key.snktruetrue
+ 2.0.0
-
+
-
+
\ No newline at end of file
diff --git a/test/Microsoft.DotNet.TestFramework/TestAssets.cs b/test/Microsoft.DotNet.TestFramework/TestAssets.cs
index e4e94fe29..6d05788fd 100644
--- a/test/Microsoft.DotNet.TestFramework/TestAssets.cs
+++ b/test/Microsoft.DotNet.TestFramework/TestAssets.cs
@@ -59,8 +59,8 @@ namespace Microsoft.DotNet.TestFramework
var assetDirectory = new DirectoryInfo(Path.Combine(_root.FullName, kind, name));
return new TestAssetInfo(
- assetDirectory,
- name,
+ assetDirectory,
+ name,
this);
}
diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Assertions/CommandResultAssertions.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/Assertions/CommandResultAssertions.cs
index f8317f34a..bdb460302 100644
--- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Assertions/CommandResultAssertions.cs
+++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Assertions/CommandResultAssertions.cs
@@ -69,6 +69,13 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
return new AndConstraint(this);
}
+ public AndConstraint NotHaveStdOutContaining(string pattern)
+ {
+ Execute.Assertion.ForCondition(!_commandResult.StdOut.Contains(pattern))
+ .FailWith(AppendDiagnosticsTo($"The command output contained a result it should not have contained: {pattern}{Environment.NewLine}"));
+ return new AndConstraint(this);
+ }
+
public AndConstraint HaveStdOutMatching(string pattern, RegexOptions options = RegexOptions.None)
{
Execute.Assertion.ForCondition(Regex.Match(_commandResult.StdOut, pattern, options).Success)
diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/BufferedReporter.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/BufferedReporter.cs
new file mode 100644
index 000000000..d4c865b08
--- /dev/null
+++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/BufferedReporter.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using Microsoft.DotNet.Cli.Utils;
+
+namespace Microsoft.DotNet.Tools.Test.Utilities
+{
+ public class BufferedReporter : IReporter
+ {
+ public List Lines { get; private set; } = new List();
+
+ public void WriteLine(string message)
+ {
+ Lines.Add(message);
+ }
+
+ public void WriteLine()
+ {
+ Lines.Add("");
+ }
+
+ public void Write(string message)
+ {
+ throw new NotImplementedException();
+ }
+ }
+}
\ No newline at end of file
diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/BuildServerCommand.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/BuildServerCommand.cs
new file mode 100644
index 000000000..986587188
--- /dev/null
+++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/BuildServerCommand.cs
@@ -0,0 +1,20 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.DotNet.Cli.Utils;
+
+namespace Microsoft.DotNet.Tools.Test.Utilities
+{
+ public sealed class BuildServerCommand : DotnetCommand
+ {
+ public override CommandResult Execute(string args = "")
+ {
+ return base.Execute($"build-server {args}");
+ }
+
+ public override CommandResult ExecuteWithCapturedOutput(string args = "")
+ {
+ return base.ExecuteWithCapturedOutput($"build-server {args}");
+ }
+ }
+}
diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/DotnetTestCommand.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/DotnetTestCommand.cs
index 129080b8e..6e6dd548a 100644
--- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/DotnetTestCommand.cs
+++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/DotnetTestCommand.cs
@@ -35,7 +35,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
return null;
}
- return $"/p:RuntimeIdentifier={_runtime}";
+ return $"-property:RuntimeIdentifier={_runtime}";
}
}
}
diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/RestoreCommand.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/RestoreCommand.cs
index cc5804a1a..d2b43b702 100644
--- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/RestoreCommand.cs
+++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/RestoreCommand.cs
@@ -35,7 +35,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
return null;
}
- return $"/p:RuntimeIdentifier={_runtime}";
+ return $"-property:RuntimeIdentifier={_runtime}";
}
}
}
diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/ToolCommand.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/ToolCommand.cs
new file mode 100644
index 000000000..3a3589f73
--- /dev/null
+++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/ToolCommand.cs
@@ -0,0 +1,20 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.DotNet.Cli.Utils;
+
+namespace Microsoft.DotNet.Tools.Test.Utilities
+{
+ public sealed class ToolCommand : DotnetCommand
+ {
+ public override CommandResult Execute(string args = "")
+ {
+ return base.Execute($"tool {args}");
+ }
+
+ public override CommandResult ExecuteWithCapturedOutput(string args = "")
+ {
+ return base.ExecuteWithCapturedOutput($"tool {args}");
+ }
+ }
+}
diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj b/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj
index 0a47e5b22..3bd17e138 100644
--- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj
+++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj
@@ -1,12 +1,13 @@
Microsoft.DotNet.Tools.Tests.Utilities Class Library
- netstandard1.5
+ netstandard2.0Microsoft.DotNet.Tools.Tests.Utilities../../tools/Key.snktruetrue$(AssetTargetFallback);dotnet5.4;portable-net451+win8
+ 2.0.0
@@ -16,7 +17,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/NuGetFrameworks.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/NuGetFrameworks.cs
new file mode 100644
index 000000000..a7ad2fa18
--- /dev/null
+++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/NuGetFrameworks.cs
@@ -0,0 +1,17 @@
+using NuGet.Frameworks;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Microsoft.DotNet.Tools.Tests.Utilities
+{
+ // This class is for frameworks that aren't yet in NuGet's FrameworkConstants.CommonFrameworks class
+ public static class NuGetFrameworks
+ {
+ public static readonly NuGetFramework NetCoreApp21
+ = new NuGetFramework(FrameworkConstants.FrameworkIdentifiers.NetCoreApp, new Version(2, 1, 0, 0));
+
+ public static readonly NuGetFramework NetCoreApp22
+ = new NuGetFramework(FrameworkConstants.FrameworkIdentifiers.NetCoreApp, new Version(2, 2, 0, 0));
+ }
+}
diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Properties/Properties.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/Properties/Properties.cs
index 98bfc776e..be0d4944b 100644
--- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Properties/Properties.cs
+++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Properties/Properties.cs
@@ -3,5 +3,8 @@
using System.Runtime.CompilerServices;
-[assembly: InternalsVisibleTo("Microsoft.Extensions.DependencyModel.Tests , PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.DotNet.Configurer.UnitTests , PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.Extensions.DependencyModel.Tests , PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.DotNet.Configurer.UnitTests , PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("dotnet.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.DotNet.ToolPackage.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.DotNet.ShellShim.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/RepoDirectoriesProvider.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/RepoDirectoriesProvider.cs
index bf1cc2050..7de277852 100644
--- a/test/Microsoft.DotNet.Tools.Tests.Utilities/RepoDirectoriesProvider.cs
+++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/RepoDirectoriesProvider.cs
@@ -15,6 +15,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
private static string s_buildRid;
private string _artifacts;
+ private string _dotnetRoot;
private string _builtDotnet;
private string _nugetPackages;
private string _stage2Sdk;
@@ -37,9 +38,14 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
string directory = AppContext.BaseDirectory;
#endif
- while (!Directory.Exists(Path.Combine(directory, ".git")) && directory != null)
+ while (directory != null)
{
- directory = Directory.GetParent(directory).FullName;
+ var gitDirOrFile = Path.Combine(directory, ".git");
+ if (Directory.Exists(gitDirOrFile) || File.Exists(gitDirOrFile))
+ {
+ break;
+ }
+ directory = Directory.GetParent(directory)?.FullName;
}
if (directory == null)
@@ -80,6 +86,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
public string Artifacts => _artifacts;
public string BuiltDotnet => _builtDotnet;
+ public string DotnetRoot => _dotnetRoot;
public string NugetPackages => _nugetPackages;
public string Stage2Sdk => _stage2Sdk;
public string Stage2WithBackwardsCompatibleRuntimesDirectory => _stage2WithBackwardsCompatibleRuntimesDirectory;
@@ -101,6 +108,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
previousStage.ToString(),
BuildRid);
_builtDotnet = builtDotnet ?? Path.Combine(_artifacts, "intermediate", "sharedFrameworkPublish");
+ _dotnetRoot = Path.Combine(_artifacts, "dotnet");
_nugetPackages = nugetPackages ?? Path.Combine(RepoRoot, ".nuget", "packages");
_stage2Sdk = Directory
.EnumerateDirectories(Path.Combine(_artifacts, "dotnet", "sdk"))
@@ -112,7 +120,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
_testPackages = Environment.GetEnvironmentVariable("TEST_PACKAGES");
if (string.IsNullOrEmpty(_testPackages))
{
- throw new InvalidOperationException("TEST_PACKAGES environment variable not set");
+ _testPackages = Path.Combine(_artifacts, "test", "packages");
}
_testWorkingFolder = Path.Combine(RepoRoot,
diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/UnixOnlyFactAttribute.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/UnixOnlyFactAttribute.cs
new file mode 100644
index 000000000..78be9c856
--- /dev/null
+++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/UnixOnlyFactAttribute.cs
@@ -0,0 +1,19 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.DotNet.PlatformAbstractions;
+using Xunit;
+
+namespace Microsoft.DotNet.Tools.Test.Utilities
+{
+ public class UnixOnlyFactAttribute : FactAttribute
+ {
+ public UnixOnlyFactAttribute()
+ {
+ if (RuntimeEnvironment.OperatingSystemPlatform == Platform.Windows)
+ {
+ this.Skip = "This test requires Unix to run";
+ }
+ }
+ }
+}
diff --git a/testAsset.props b/testAsset.props
index b130414b8..8d003d8ab 100644
--- a/testAsset.props
+++ b/testAsset.props
@@ -1,4 +1,8 @@
+
+ $(MSBuildThisFileDirectory)
+
+ $(TEST_PACKAGES)
diff --git a/tools/CrossGen.Dependencies/CrossGen.Dependencies.csproj b/tools/CrossGen.Dependencies/CrossGen.Dependencies.csproj
index 33051ba8e..0ca594efa 100644
--- a/tools/CrossGen.Dependencies/CrossGen.Dependencies.csproj
+++ b/tools/CrossGen.Dependencies/CrossGen.Dependencies.csproj
@@ -1,11 +1,11 @@
- netcoreapp2.0
+ netcoreapp2.2$(SharedFrameworkRid)
-
+
diff --git a/tools/Signing.Dependencies/Signing.Dependencies.csproj b/tools/Signing.Dependencies/Signing.Dependencies.csproj
index dc8cd6914..f4ae4c40e 100644
--- a/tools/Signing.Dependencies/Signing.Dependencies.csproj
+++ b/tools/Signing.Dependencies/Signing.Dependencies.csproj
@@ -4,7 +4,7 @@
-
+