Merge branch 'master' of https://github.com/MikhailArkhipov/python-language-server

Author: MikhailArkhipov

build/Common.Build.Core.settings

@@ -31,12 +31,6 @@
     <BuildNumber Condition="'$(BuildNumber)' == ''">$(BUILD_BUILDNUMBER)</BuildNumber>
     <BuildNumber Condition="'$(BuildNumber)' == ''">1000.00</BuildNumber>
     <!--
-    The version number that will identify a specific build. This appears in
-    Programs and Features, Extension Manager, and Help About.
-    -->
-    <FileVersionPrefix Condition="$(FileVersionPrefix) == ''">16.0</FileVersionPrefix>
-    <FileVersion Condition="$(FileVersion) == ''">$(FileVersionPrefix).$(BuildNumber)</FileVersion>
-    <!--
     The version number that will identify assembly compatibility.
     -->
     <StableVersionPrefix Condition="$(StableVersionPrefix) == ''">$(VSTarget).0</StableVersionPrefix>

build/NetStandard.settings

@@ -7,6 +7,8 @@
   <PropertyGroup>
     <BuildDependsOn>ValidateAssemblyName;$(BuildDependsOn)</BuildDependsOn>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
+    <Company>Microsoft</Company>
   </PropertyGroup>
 
   <!-- Compilation -->
@@ -24,11 +26,6 @@
     <RuntimeIdentifiers>win-x86;win-x64;osx-x64;linux-x64</RuntimeIdentifiers>
   </PropertyGroup>
 
-  <!-- Versioning -->
-  <PropertyGroup>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-  </PropertyGroup>
-
   <!-- Signing -->
   <PropertyGroup>
     <MicroBuild_DoNotStrongNameSign>true</MicroBuild_DoNotStrongNameSign>

src/Analysis/Engine/Test/Properties/AssemblyInfo.cs

@@ -9,16 +9,13 @@
 // 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.
+// MERCHANTABILITY OR NON-INFRINGEMENT.
 //
 // See the Apache Version 2.0 License for specific language governing
 // permissions and limitations under the License.
 
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyTitle("AnalysisTests")]
-[assembly: AssemblyDescription("")]
-
 [assembly: ComVisible(false)]
 [assembly: Guid("3e11e47d-2321-4769-96b9-38b1eaf8e4eb")]

src/Publish/SignLayout.csproj

@@ -3,7 +3,7 @@
     <TargetFramework>netcoreapp2.1</TargetFramework>
     <NoWarn>2008;$(NoWarn)</NoWarn>
   </PropertyGroup>
-  <Import Project="..\..\NetStandard.settings" />
+  <Import Project="..\..\build\NetStandard.settings" />
 
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
 
@@ -52,5 +52,5 @@
     <Error Condition="@(_Missing) != ''" Text="Following files are missing: @(_Missing,'%0A')" />
   </Target>
 
-  <Import Project="..\..\NetStandard.targets" />
+  <Import Project="..\..\build\NetStandard.targets" />
 </Project>