Skip to content

Commit 85df1f6

Browse files
committed
Drop FirstTimeMessageAspNetCertificateLinux
As of dotnet/aspnetcore#56582, `--trust` is supported on (key distros of) Linux. Unofficially, it will likely work on others as well.
1 parent 971e7aa commit 85df1f6

14 files changed

+31
-147
lines changed

src/Cli/Microsoft.DotNet.Configurer/DotnetFirstTimeUseConfigurer.cs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,14 +83,11 @@ public void Configure()
8383

8484
if (canShowFirstUseMessages)
8585
{
86-
var aspNetCertMessage = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) || RuntimeInformation.IsOSPlatform(OSPlatform.OSX) ?
87-
// The instructions in this message only apply to Windows and MacOS.
88-
LocalizableStrings.FirstTimeMessageAspNetCertificate :
89-
// The instructions in this message only apply to Linux (various distros).
90-
// OSPlatform.FreeBSD would also see this message, which is acceptable since we have no specific FreeBSD instructions.
91-
LocalizableStrings.FirstTimeMessageAspNetCertificateLinux;
86+
// This message is slightly misleading for (e.g.) FreeBSD, which doesn't officially
87+
// support `dotnet dev-certs https --trust`, but the link in the message should help
88+
// users find the right steps for their platform.
9289
_reporter.WriteLine();
93-
_reporter.WriteLine(aspNetCertMessage);
90+
_reporter.WriteLine(LocalizableStrings.FirstTimeMessageAspNetCertificate);
9491
}
9592
}
9693
}

src/Cli/Microsoft.DotNet.Configurer/LocalizableStrings.resx

Lines changed: 27 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<root>
3-
<!--
4-
Microsoft ResX Schema
5-
3+
<!--
4+
Microsoft ResX Schema
5+
66
Version 2.0
7-
8-
The primary goals of this format is to allow a simple XML format
9-
that is mostly human readable. The generation and parsing of the
10-
various data types are done through the TypeConverter classes
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
1111
associated with the data types.
12-
12+
1313
Example:
14-
14+
1515
... ado.net/XML headers & schema ...
1616
<resheader name="resmimetype">text/microsoft-resx</resheader>
1717
<resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
2626
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
2727
<comment>This is a comment</comment>
2828
</data>
29-
30-
There are any number of "resheader" rows that contain simple
29+
30+
There are any number of "resheader" rows that contain simple
3131
name/value pairs.
32-
33-
Each data row contains a name, and value. The row also contains a
34-
type or mimetype. Type corresponds to a .NET class that support
35-
text/value conversion through the TypeConverter architecture.
36-
Classes that don't support this are serialized and stored with the
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
3737
mimetype set.
38-
39-
The mimetype is used for serialized objects, and tells the
40-
ResXResourceReader how to depersist the object. This is currently not
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
4141
extensible. For a given mimetype the value must be set accordingly:
42-
43-
Note - application/x-microsoft.net.object.binary.base64 is the format
44-
that the ResXResourceWriter will generate, however the reader can
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
4545
read any of the formats listed below.
46-
46+
4747
mimetype: application/x-microsoft.net.object.binary.base64
48-
value : The object must be serialized with
48+
value : The object must be serialized with
4949
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
5050
: and then encoded with base64 encoding.
51-
51+
5252
mimetype: application/x-microsoft.net.object.soap.base64
53-
value : The object must be serialized with
53+
value : The object must be serialized with
5454
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
5555
: and then encoded with base64 encoding.
5656
5757
mimetype: application/x-microsoft.net.object.bytearray.base64
58-
value : The object must be serialized into a byte array
58+
value : The object must be serialized into a byte array
5959
: using a System.ComponentModel.TypeConverter
6060
: and then encoded with base64 encoding.
6161
-->
@@ -147,9 +147,4 @@ Installed an ASP.NET Core HTTPS development certificate.
147147
To trust the certificate, run 'dotnet dev-certs https --trust'
148148
Learn about HTTPS: https://aka.ms/dotnet-https</value>
149149
</data>
150-
<data name="FirstTimeMessageAspNetCertificateLinux" xml:space="preserve">
151-
<value>----------------
152-
Installed an ASP.NET Core HTTPS development certificate.
153-
To trust the certificate, view the instructions: https://aka.ms/dotnet-https-linux</value>
154-
</data>
155150
</root>

src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.cs.xlf

Lines changed: 0 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.es.xlf

Lines changed: 0 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.fr.xlf

Lines changed: 0 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.it.xlf

Lines changed: 0 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ja.xlf

Lines changed: 0 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ko.xlf

Lines changed: 0 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pl.xlf

Lines changed: 0 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pt-BR.xlf

Lines changed: 0 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ru.xlf

Lines changed: 0 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.tr.xlf

Lines changed: 0 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hans.xlf

Lines changed: 0 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hant.xlf

Lines changed: 0 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)