Skip to content

Commit d5fbddc

Browse files
author
Denis Peshkov
committed
* upgrade pre-release pkgs
* comment additional logging
1 parent 55327f0 commit d5fbddc

5 files changed

Lines changed: 16 additions & 14 deletions

File tree

‎lib/Microsoft.VisualStudio.Telemetry.dll‎

-460 KB
Binary file not shown.

‎src/TypeScriptDefinitionGenerator/Generator/IntellisenseParser.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -280,8 +280,8 @@ private static IntellisenseType GetType(CodeClass rootElement, CodeTypeRef codeT
280280
CodeName = effectiveTypeRef.AsString
281281
};
282282

283-
VSHelpers.WriteOnBuildDebugWindow($"#{result.CodeName}#{result.TypeScriptName}#{effectiveTypeRef.AsString}#{effectiveTypeRef.AsFullName}#{effectiveTypeRef.CodeType}");
284-
VSHelpers.WriteOnBuildDebugWindow($"##{effectiveTypeRef.TypeKind}##{vsCMTypeRef.vsCMTypeRefCodeType}##{effectiveTypeRef.CodeType.InfoLocation}##{vsCMInfoLocation.vsCMInfoLocationProject}");
283+
//VSHelpers.WriteOnBuildDebugWindow($"#{result.CodeName}#{result.TypeScriptName}#{effectiveTypeRef.AsString}#{effectiveTypeRef.AsFullName}#{effectiveTypeRef.CodeType}");
284+
//VSHelpers.WriteOnBuildDebugWindow($"##{effectiveTypeRef.TypeKind}##{vsCMTypeRef.vsCMTypeRefCodeType}##{effectiveTypeRef.CodeType.InfoLocation}##{vsCMInfoLocation.vsCMInfoLocationProject}");
285285

286286
result.ClientSideReferenceName = null;
287287
if (effectiveTypeRef.TypeKind == vsCMTypeRef.vsCMTypeRefCodeType)
@@ -295,7 +295,7 @@ private static IntellisenseType GetType(CodeClass rootElement, CodeTypeRef codeT
295295
hasIntellisense = HasIntellisense(codeEnum.ProjectItem, references);
296296
}
297297

298-
VSHelpers.WriteOnBuildDebugWindow($"@{codeClass != null}@{codeEnum != null}@{hasIntellisense}@{Options.DeclareModule}");
298+
//VSHelpers.WriteOnBuildDebugWindow($"@{codeClass != null}@{codeEnum != null}@{hasIntellisense}@{Options.DeclareModule}");
299299
result.ClientSideReferenceName = (codeClass != null && hasIntellisense ? (Options.DeclareModule ? GetNamespace(codeClass) + "." : "") + Utility.CamelCaseClassName(GetClassName(codeClass)) : null) ??
300300
(codeEnum != null && hasIntellisense ? (Options.DeclareModule ? GetNamespace(codeEnum) + "." : "") + Utility.CamelCaseClassName(GetEnumName(codeEnum)) : null) ??
301301
(codeInterface != null && hasIntellisense ? (Options.DeclareModule ? GetNamespace(codeInterface) + "." : "") + Utility.CamelCaseClassName(GetInterfaceName(codeInterface)) : null);

‎src/TypeScriptDefinitionGenerator/TypeScriptDefinitionGenerator.csproj‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@
106106
<Private>False</Private>
107107
</Reference>
108108
<Reference Include="Microsoft.CSharp" />
109-
<Reference Include="Microsoft.Diagnostics.Tracing.EventSource, Version=1.1.16.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
110-
<HintPath>..\..\packages\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.16-beta\lib\net45\Microsoft.Diagnostics.Tracing.EventSource.dll</HintPath>
109+
<Reference Include="Microsoft.Diagnostics.Tracing.EventSource, Version=1.1.28.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
110+
<HintPath>..\..\packages\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.28\lib\net46\Microsoft.Diagnostics.Tracing.EventSource.dll</HintPath>
111111
</Reference>
112112
<Reference Include="Microsoft.VisualStudio.CommandBars, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
113113
<EmbedInteropTypes>False</EmbedInteropTypes>
@@ -130,7 +130,7 @@
130130
<Private>True</Private>
131131
</Reference>
132132
<Reference Include="Microsoft.VisualStudio.RemoteControl, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
133-
<HintPath>..\..\packages\Microsoft.VisualStudio.RemoteControl.14.0.263-masterA66FF384\lib\net45\Microsoft.VisualStudio.RemoteControl.dll</HintPath>
133+
<HintPath>..\..\packages\Microsoft.VisualStudio.RemoteControl.14.1.2\lib\net45\Microsoft.VisualStudio.RemoteControl.dll</HintPath>
134134
</Reference>
135135
<Reference Include="Microsoft.VisualStudio.Shell.15.0, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
136136
<HintPath>..\..\packages\Microsoft.VisualStudio.Shell.15.0.15.4.27004\lib\Microsoft.VisualStudio.Shell.15.0.dll</HintPath>
@@ -173,7 +173,7 @@
173173
<Private>False</Private>
174174
</Reference>
175175
<Reference Include="Microsoft.VisualStudio.Telemetry, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
176-
<HintPath>..\..\packages\Microsoft.VisualStudio.Telemetry.15.8.950-master0B174108\lib\net45\Microsoft.VisualStudio.Telemetry.dll</HintPath>
176+
<HintPath>..\..\packages\Microsoft.VisualStudio.Telemetry.15.8.956\lib\net45\Microsoft.VisualStudio.Telemetry.dll</HintPath>
177177
</Reference>
178178
<Reference Include="Microsoft.VisualStudio.Text.Data, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
179179
<HintPath>..\..\packages\Microsoft.VisualStudio.Text.Data.15.4.27004\lib\net45\Microsoft.VisualStudio.Text.Data.dll</HintPath>
@@ -223,7 +223,7 @@
223223
<Private>True</Private>
224224
</Reference>
225225
<Reference Include="Microsoft.VisualStudio.Utilities.Internal, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
226-
<HintPath>..\..\packages\Microsoft.VisualStudio.Utilities.Internal.14.0.79-master7F49A4E3\lib\net45\Microsoft.VisualStudio.Utilities.Internal.dll</HintPath>
226+
<HintPath>..\..\packages\Microsoft.VisualStudio.Utilities.Internal.14.1.2\lib\net45\Microsoft.VisualStudio.Utilities.Internal.dll</HintPath>
227227
</Reference>
228228
<Reference Include="Microsoft.VisualStudio.Validation, Version=15.3.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
229229
<HintPath>..\..\packages\Microsoft.VisualStudio.Validation.15.3.32\lib\net45\Microsoft.VisualStudio.Validation.dll</HintPath>
@@ -286,11 +286,9 @@
286286
<Error Condition="!Exists('..\..\packages\Microsoft.VSSDK.BuildTools.15.5.72\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VSSDK.BuildTools.15.5.72\build\Microsoft.VSSDK.BuildTools.props'))" />
287287
<Error Condition="!Exists('..\..\packages\Microsoft.VSSDK.BuildTools.15.5.72\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VSSDK.BuildTools.15.5.72\build\Microsoft.VSSDK.BuildTools.targets'))" />
288288
<Error Condition="!Exists('..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.15.7.17\build\Microsoft.VisualStudio.Threading.Analyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.15.7.17\build\Microsoft.VisualStudio.Threading.Analyzers.targets'))" />
289-
<Error Condition="!Exists('..\..\packages\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.16-beta\build\portable-net45+win8+wpa81\Microsoft.Diagnostics.Tracing.EventSource.Redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.16-beta\build\portable-net45+win8+wpa81\Microsoft.Diagnostics.Tracing.EventSource.Redist.targets'))" />
290289
</Target>
291290
<Import Project="..\..\packages\Microsoft.VSSDK.BuildTools.15.5.72\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\..\packages\Microsoft.VSSDK.BuildTools.15.5.72\build\Microsoft.VSSDK.BuildTools.targets')" />
292291
<Import Project="..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.15.7.17\build\Microsoft.VisualStudio.Threading.Analyzers.targets" Condition="Exists('..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.15.7.17\build\Microsoft.VisualStudio.Threading.Analyzers.targets')" />
293-
<Import Project="..\..\packages\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.16-beta\build\portable-net45+win8+wpa81\Microsoft.Diagnostics.Tracing.EventSource.Redist.targets" Condition="Exists('..\..\packages\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.16-beta\build\portable-net45+win8+wpa81\Microsoft.Diagnostics.Tracing.EventSource.Redist.targets')" />
294292
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
295293
Other similar extension points exist, see Microsoft.Common.targets.
296294
<Target Name="BeforeBuild">

‎src/TypeScriptDefinitionGenerator/app.config‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
77
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
88
</dependentAssembly>
9+
<dependentAssembly>
10+
<assemblyIdentity name="Microsoft.Diagnostics.Tracing.EventSource" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
11+
<bindingRedirect oldVersion="0.0.0.0-1.1.28.0" newVersion="1.1.28.0" />
12+
</dependentAssembly>
913
</assemblyBinding>
1014
</runtime>
1115
</configuration>

‎src/TypeScriptDefinitionGenerator/packages.config‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Diagnostics.Tracing.EventSource.Redist" version="1.1.16-beta" targetFramework="net462" />
3+
<package id="Microsoft.Diagnostics.Tracing.EventSource.Redist" version="1.1.28" targetFramework="net462" />
44
<package id="Microsoft.VisualStudio.CoreUtility" version="15.4.27004" targetFramework="net46" />
55
<package id="Microsoft.VisualStudio.Editor" version="15.4.27004" targetFramework="net46" />
66
<package id="Microsoft.VisualStudio.Imaging" version="15.4.27004" targetFramework="net462" />
77
<package id="Microsoft.VisualStudio.OLE.Interop" version="7.10.6071" targetFramework="net462" />
8-
<package id="Microsoft.VisualStudio.RemoteControl" version="14.0.263-masterA66FF384" targetFramework="net462" />
8+
<package id="Microsoft.VisualStudio.RemoteControl" version="14.1.2" targetFramework="net462" />
99
<package id="Microsoft.VisualStudio.SDK.Analyzers" version="15.7.4" targetFramework="net462" />
1010
<package id="Microsoft.VisualStudio.SDK.EmbedInteropTypes" version="15.0.12" targetFramework="net462" />
1111
<package id="Microsoft.VisualStudio.Shell.15.0" version="15.4.27004" targetFramework="net462" />
@@ -17,7 +17,7 @@
1717
<package id="Microsoft.VisualStudio.Shell.Interop.15.3.DesignTime" version="15.0.26606" targetFramework="net462" />
1818
<package id="Microsoft.VisualStudio.Shell.Interop.8.0" version="8.0.50727" targetFramework="net46" />
1919
<package id="Microsoft.VisualStudio.Shell.Interop.9.0" version="9.0.30729" targetFramework="net46" />
20-
<package id="Microsoft.VisualStudio.Telemetry" version="15.8.950-master0B174108" targetFramework="net462" />
20+
<package id="Microsoft.VisualStudio.Telemetry" version="15.8.956" targetFramework="net462" />
2121
<package id="Microsoft.VisualStudio.Text.Data" version="15.4.27004" targetFramework="net46" />
2222
<package id="Microsoft.VisualStudio.Text.Logic" version="15.4.27004" targetFramework="net46" />
2323
<package id="Microsoft.VisualStudio.Text.UI" version="15.4.27004" targetFramework="net46" />
@@ -31,7 +31,7 @@
3131
<package id="Microsoft.VisualStudio.Threading" version="15.4.4" targetFramework="net462" />
3232
<package id="Microsoft.VisualStudio.Threading.Analyzers" version="15.7.17" targetFramework="net462" />
3333
<package id="Microsoft.VisualStudio.Utilities" version="15.4.27004" targetFramework="net462" />
34-
<package id="Microsoft.VisualStudio.Utilities.Internal" version="14.0.79-master7F49A4E3" targetFramework="net462" />
34+
<package id="Microsoft.VisualStudio.Utilities.Internal" version="14.1.2" targetFramework="net462" />
3535
<package id="Microsoft.VisualStudio.Validation" version="15.3.32" targetFramework="net462" />
3636
<package id="Microsoft.VSSDK.BuildTools" version="15.5.72" targetFramework="net462" developmentDependency="true" />
3737
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net46" />

0 commit comments

Comments
 (0)