diff --git a/build/BundledDotnetTools.props b/build/BundledDotnetTools.props
index ceb89cfd2..1df3521de 100644
--- a/build/BundledDotnetTools.props
+++ b/build/BundledDotnetTools.props
@@ -1,5 +1,5 @@
-
+
diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props
index c2876983b..45234b98b 100644
--- a/build/BundledRuntimes.props
+++ b/build/BundledRuntimes.props
@@ -55,13 +55,6 @@
- <_DownloadAndExtractItem Include="AspNetCoreSharedFxArchiveFile"
- Condition="!Exists('$(AspNetCoreSharedFxArchiveFile)') And ( '$(AspNetCoreSharedFxArchiveRid)' == 'linux-arm' OR !$(Architecture.StartsWith('arm')) )">
- $(AspNetCoreSharedFxRootUrl)$(AspNetCoreVersion)/$(AspNetCoreSharedFxArchiveFileName)$(CoreSetupBlobAccessTokenParam)
- $(AspNetCoreSharedFxArchiveFile)
- $(AspNetCoreSharedFxPublishDirectory)
-
-
<_DownloadAndExtractItem Include="CombinedSharedHostAndFrameworkArchive"
Condition="!Exists('$(CombinedSharedHostAndFrameworkArchive)')">
$(CoreSetupRootUrl)$(MicrosoftNETCoreAppPackageVersion)/$(CombinedFrameworkHostCompressedFileName)$(CoreSetupBlobAccessTokenParam)
@@ -96,6 +89,15 @@
$(DownloadedHostFxrInstallerFile)
+
+
+
+ <_DownloadAndExtractItem Include="AspNetCoreSharedFxArchiveFile"
+ Condition="!Exists('$(AspNetCoreSharedFxArchiveFile)') And ( '$(AspNetCoreSharedFxArchiveRid)' == 'linux-arm' OR !$(Architecture.StartsWith('arm')) )">
+ $(AspNetCoreSharedFxRootUrl)$(AspNetCoreVersion)/$(AspNetCoreSharedFxArchiveFileName)$(CoreSetupBlobAccessTokenParam)
+ $(AspNetCoreSharedFxArchiveFile)
+ $(AspNetCoreSharedFxPublishDirectory)
+
<_DownloadAndExtractItem Include="DownloadedAspNetCoreSharedFxInstallerFile"
Condition="'$(SkipBuildingInstallers)' != 'true' AND '$(DownloadedAspNetCoreSharedFxInstallerFile)' != '' AND !Exists($(DownloadedAspNetCoreSharedFxInstallerFile)) And '$(InstallerExtension)' != '' And !$(Architecture.StartsWith('arm'))">
diff --git a/build/MSBuildExtensions.targets b/build/MSBuildExtensions.targets
index 67e864f1c..567c31fe4 100644
--- a/build/MSBuildExtensions.targets
+++ b/build/MSBuildExtensions.targets
@@ -123,7 +123,29 @@
<_AspNetCoreAppTargetFrameworkVersion>$(_AspNetCoreAllTargetFrameworkVersion)
<_NETCoreSdkIsPreview Condition=" '$(DropSuffix)' == '' ">true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
$(_NETStandardTargetFrameworkVersion)
$(_NETStandardLibraryPackageVersion)
$(_NETCorePlatformsPackageVersion)
- $(_AspNetCoreAllTargetFrameworkVersion)
- $(_AspNetCoreAllPackageVersion)
- $(_AspNetCoreAppTargetFrameworkVersion)
- $(_AspNetCoreAppPackageVersion)
+ @(BundledVersionsVariable->'<%(Identity)>%(Value)%(Identity)>', '%0A ')
$(SdkVersion)
<_NETCoreSdkIsPreview>$(_NETCoreSdkIsPreview)
diff --git a/src/Microsoft.DotNet.Configurer/DotnetFirstTimeUseConfigurer.cs b/src/Microsoft.DotNet.Configurer/DotnetFirstTimeUseConfigurer.cs
index 966bd0d80..2cb502256 100644
--- a/src/Microsoft.DotNet.Configurer/DotnetFirstTimeUseConfigurer.cs
+++ b/src/Microsoft.DotNet.Configurer/DotnetFirstTimeUseConfigurer.cs
@@ -90,12 +90,16 @@ namespace Microsoft.DotNet.Configurer
private bool ShouldGenerateAspNetCertificate()
{
+#if EXCLUDE_ASPNETCORE
+ return false;
+#else
var generateAspNetCertificate =
_environmentProvider.GetEnvironmentVariableAsBool("DOTNET_GENERATE_ASPNET_CERTIFICATE", true);
return ShouldRunFirstRunExperience() &&
generateAspNetCertificate &&
!_aspNetCertificateSentinel.Exists();
+#endif
}
private bool ShouldAddPackageExecutablePath()
@@ -153,7 +157,7 @@ namespace Microsoft.DotNet.Configurer
private bool ShouldRunFirstRunExperience()
{
- var skipFirstTimeExperience =
+ var skipFirstTimeExperience =
_environmentProvider.GetEnvironmentVariableAsBool("DOTNET_SKIP_FIRST_TIME_EXPERIENCE", false);
return !skipFirstTimeExperience;
diff --git a/src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj b/src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj
index a393f7926..dbc6f7e6f 100644
--- a/src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj
+++ b/src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj
@@ -9,6 +9,7 @@
true
git
git://github.com/dotnet/cli
+ $(DefineConstants);EXCLUDE_ASPNETCORE
@@ -26,4 +27,4 @@
-
\ No newline at end of file
+
diff --git a/src/dotnet/AspNetCoreCertificateGenerator.cs b/src/dotnet/AspNetCoreCertificateGenerator.cs
index d0fcf0a9a..17de9ebce 100644
--- a/src/dotnet/AspNetCoreCertificateGenerator.cs
+++ b/src/dotnet/AspNetCoreCertificateGenerator.cs
@@ -1,7 +1,6 @@
// 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.AspNetCore.DeveloperCertificates.XPlat;
using Microsoft.DotNet.Configurer;
namespace Microsoft.DotNet.Cli
@@ -10,7 +9,9 @@ namespace Microsoft.DotNet.Cli
{
public void GenerateAspNetCoreDevelopmentCertificate()
{
- CertificateGenerator.GenerateAspNetHttpsCertificate();
+#if !EXCLUDE_ASPNETCORE
+ Microsoft.AspNetCore.DeveloperCertificates.XPlat.CertificateGenerator.GenerateAspNetHttpsCertificate();
+#endif
}
}
}
diff --git a/src/dotnet/dotnet.csproj b/src/dotnet/dotnet.csproj
index b7d26a073..b739ba700 100644
--- a/src/dotnet/dotnet.csproj
+++ b/src/dotnet/dotnet.csproj
@@ -9,6 +9,7 @@
true
dotnet5.4
Microsoft.DotNet.Cli
+ $(DefineConstants);EXCLUDE_ASPNETCORE
@@ -60,7 +61,6 @@
-
@@ -75,6 +75,11 @@
+
+
+
+
+