Skip to content

Commit

Permalink
Merge with master
Browse files Browse the repository at this point in the history
  • Loading branch information
Hugues Valois committed Feb 10, 2017
2 parents bea6f14 + b2a8f6d commit 25ac8c5
Show file tree
Hide file tree
Showing 193 changed files with 5,264 additions and 4,592 deletions.
1,463 changes: 1,312 additions & 151 deletions Python/Product/Common/Strings.Designer.cs

Large diffs are not rendered by default.

438 changes: 438 additions & 0 deletions Python/Product/Common/Strings.resx

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Python/Product/IronPython/Debugger/IronPythonLauncher.cs
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public IronPythonLauncher(IServiceProvider serviceProvider, PythonToolsService p
private static readonly Lazy<string> NoIronPythonHelpPage = new Lazy<string>(() => {
try {
var path = Path.GetDirectoryName(typeof(IronPythonLauncher).Assembly.Location);
return Path.Combine(path, "NoIronPython.mht");
return Path.Combine(path, "NoIronPython.html");
} catch (ArgumentException) {
} catch (NotSupportedException) {
}
Expand Down
4 changes: 2 additions & 2 deletions Python/Product/IronPython/IronPython.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -165,10 +165,10 @@
<IncludeInVSIX>true</IncludeInVSIX>
<VSIXSubPath>.</VSIXSubPath>
</Content>
<None Include="NoIronPython.html" />
<None Include="NoIronPython.htmlsrc" />
</ItemGroup>
<ItemGroup>
<Content Include="NoIronPython.mht">
<Content Include="NoIronPython.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
Expand Down
23 changes: 2 additions & 21 deletions Python/Product/IronPython/NoIronPython.html
Original file line number Diff line number Diff line change
@@ -1,27 +1,8 @@
<!DOCTYPE html>
<!--
Python Tools for Visual Studio
Copyright(c) Microsoft Corporation
All rights reserved.
Licensed under the Apache License, Version 2.0 (the License); you may not use
this file except in compliance with the License. You may obtain a copy of the
License at http://www.apache.org/licenses/LICENSE-2.0
THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS
OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY
IMPLIED WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
MERCHANTABLITY OR NON-INFRINGEMENT.
See the Apache Version 2.0 License for specific language governing
permissions and limitations under the License.
-->

<html lang="en" xmlns="http://www.w3.org/1999/xhtml">
<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
<head>
<meta charset="utf-8" />
<title>IronPython was not found</title>
<link rel="stylesheet" href="../PythonTools/ReadmeStyle.css" type="text/css" />
<style type="text/css">body { font-family: 'Segoe UI', Arial, Helvetica, sans-serif; font-weight: 200; font-size: 11pt; } p, h1, h2 { margin: 0; padding: 0; } h1 { font-size: 20pt; font-weight: bold; padding-top: 1em; } h1.top { padding-top: 0em; } h2 { font-size: 16pt; font-weight: 300; padding-top: 0.5em; padding-left: 0em; } p { padding-left: 0.5em; padding-bottom: 0.5em; } p.hint { color: #666666; } code { font-family: Consolas, 'Lucida Console', monospace; } ol { margin-top: 0; padding-top: 0; } ol > li { padding-top: 1.5em; } li > img { vertical-align: middle; }</style>
</head>

<body>
Expand Down
58 changes: 58 additions & 0 deletions Python/Product/IronPython/NoIronPython.htmlsrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
<!DOCTYPE html>
<!--
Python Tools for Visual Studio
Copyright(c) Microsoft Corporation
All rights reserved.

Licensed under the Apache License, Version 2.0 (the License); you may not use
this file except in compliance with the License. You may obtain a copy of the
License at http://www.apache.org/licenses/LICENSE-2.0

THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS
OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY
IMPLIED WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
MERCHANTABLITY OR NON-INFRINGEMENT.

See the Apache Version 2.0 License for specific language governing
permissions and limitations under the License.
-->

<html lang="en" xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta charset="utf-8" />
<title>IronPython was not found</title>
<style type="text/css" />
</head>

<body>
<h1 class="top">We didn't find IronPython</h1>
<p>
This project is configured to run with IronPython, which is
an implementation of Python on the .NET Framework.
</p>

<h2>
<a href="http://go.microsoft.com/fwlink/?LinkId=525966">
Download IronPython
</a>
</h2>
<p class="hint">
This link will take you to the IronPython project homepage,
where you can find downloads and support.
</p>

<h2>
<a href="http://go.microsoft.com/fwlink/?LinkId=293415">
Stuck?
</a>
</h2>
<p>
Visit our discussion forum and we'll be able to help you.
</p>
<p class="hint">
This link will take you to our homepage, where you can find more
documentation, discussion forums, and updates for Python Tools
for Visual Studio.
</p>
</body>
</html>
120 changes: 0 additions & 120 deletions Python/Product/IronPython/NoIronPython.mht

This file was deleted.

23 changes: 2 additions & 21 deletions Python/Product/PythonTools/NoInterpreters.html
Original file line number Diff line number Diff line change
@@ -1,27 +1,8 @@
<!DOCTYPE html>
<!--
Python Tools for Visual Studio
Copyright(c) Microsoft Corporation
All rights reserved.
Licensed under the Apache License, Version 2.0 (the License); you may not use
this file except in compliance with the License. You may obtain a copy of the
License at http://www.apache.org/licenses/LICENSE-2.0
THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS
OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY
IMPLIED WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
MERCHANTABLITY OR NON-INFRINGEMENT.
See the Apache Version 2.0 License for specific language governing
permissions and limitations under the License.
-->

<html lang="en" xmlns="http://www.w3.org/1999/xhtml">
<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
<head>
<meta charset="utf-8" />
<title>No Python interpreters found</title>
<link rel="stylesheet" href="ReadmeStyle.css" type="text/css" />
<style type="text/css">body { font-family: 'Segoe UI', Arial, Helvetica, sans-serif; font-weight: 200; font-size: 11pt; } p, h1, h2 { margin: 0; padding: 0; } h1 { font-size: 20pt; font-weight: bold; padding-top: 1em; } h1.top { padding-top: 0em; } h2 { font-size: 16pt; font-weight: 300; padding-top: 0.5em; padding-left: 0em; } p { padding-left: 0.5em; padding-bottom: 0.5em; } p.hint { color: #666666; } code { font-family: Consolas, 'Lucida Console', monospace; } ol { margin-top: 0; padding-top: 0; } ol > li { padding-top: 1.5em; } li > img { vertical-align: middle; }</style>
</head>

<body>
Expand Down
90 changes: 90 additions & 0 deletions Python/Product/PythonTools/NoInterpreters.htmlsrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
<!DOCTYPE html>
<!--
Python Tools for Visual Studio
Copyright(c) Microsoft Corporation
All rights reserved.

Licensed under the Apache License, Version 2.0 (the License); you may not use
this file except in compliance with the License. You may obtain a copy of the
License at http://www.apache.org/licenses/LICENSE-2.0

THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS
OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY
IMPLIED WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
MERCHANTABLITY OR NON-INFRINGEMENT.

See the Apache Version 2.0 License for specific language governing
permissions and limitations under the License.
-->

<html lang="en" xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta charset="utf-8" />
<title>No Python interpreters found</title>
<style type="text/css" />
</head>

<body>
<h1 class="top">We didn't find any interpreters</h1>
<p>
Installing a Python interpreter will let you run your project, and will
include useful libraries and tools.
</p>

<h2>
<a href="http://go.microsoft.com/fwlink/?LinkId=299430">
Download and install Python
</a>
</h2>
<p>
This will install the latest version (32-bit) from the
<a href="http://go.microsoft.com/fwlink/?LinkId=301496">Python
homepage</a>.
</p>
<p class="hint">
CPython is the most commonly used interpreter and has the most
up-to-date set of language features.
</p>

<h2>
<a href="http://go.microsoft.com/fwlink/?LinkId=299429">
Help me choose one
</a>
</h2>
<p>
There are other interpreters and bundles that may better suit your
needs.
</p>
<p class="hint">
This link will take you to a web page that explains the differences and
will help you download and install a bundle.
</p>

<h2>
<a href="http://go.microsoft.com/fwlink/?LinkId=301497">
I already have one
</a>
</h2>
<p>
Sorry, but we did not detect it automatically. We can use it, but you'll
need to add it yourself.
</p>
<p class="hint">
This link will take you to a web page that will help you add your
existing interpreter.
</p>

<h2>
<a href="http://go.microsoft.com/fwlink/?LinkId=293415">
Still stuck?
</a>
</h2>
<p>
Visit our discussion forum and we'll be able to help you.
</p>
<p class="hint">
This link will take you to our homepage, where you can find more
documentation, discussion forums, and updates.
</p>
</body>
</html>
Loading

0 comments on commit 25ac8c5

Please sign in to comment.