Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
0fb47d4
Addin Installer Telemetry
sanyamc-msft Aug 19, 2015
785acc2
InstallerTelemetry2
sanyamc-msft Aug 22, 2015
2cda404
Removing older files
sanyamc-msft Aug 22, 2015
99a5f49
adding indentation
sanyamc-msft Aug 24, 2015
9d75c29
Removing tabs from Buildrelease.ps1
sanyamc-msft Aug 24, 2015
a4cba5d
Addressing PR feedback
sanyamc-msft Aug 25, 2015
06f51e2
Added final feedback
sanyamc-msft Aug 26, 2015
77de181
using default wix targets
sanyamc-msft Aug 26, 2015
ef73165
Adding build.targets
sanyamc-msft Aug 26, 2015
7b3b336
Adding Build.targets
sanyamc-msft Aug 26, 2015
82500a5
Reverting build.targets changes as my dlls are projects and not dlls …
sanyamc-msft Aug 26, 2015
32ff627
Adding feedback
sanyamc-msft Aug 26, 2015
4931fe4
Adding feedback from CR
sanyamc-msft Aug 26, 2015
f1e4aae
Merge pull request #381 from nareshjo/telemetry
mousetraps Aug 26, 2015
3c6a345
Using Checked in wix.ca.targets
sanyamc-msft Aug 26, 2015
190322c
Removing assemblyversions.cs
sanyamc-msft Aug 26, 2015
5a093e5
Fixing releasebuild variable and adding csharp target to build .ca.dl…
sanyamc-msft Aug 27, 2015
ca896ec
Adding default AssemblyVersion.cs
sanyamc-msft Aug 27, 2015
34a9c26
Addin Installer Telemetry
sanyamc-msft Aug 19, 2015
d1b4d20
InstallerTelemetry2
sanyamc-msft Aug 22, 2015
b5c4e10
Removing older files
sanyamc-msft Aug 22, 2015
a722233
adding indentation
sanyamc-msft Aug 24, 2015
963acce
Removing tabs from Buildrelease.ps1
sanyamc-msft Aug 24, 2015
82518c9
Addressing PR feedback
sanyamc-msft Aug 25, 2015
135fca0
Added final feedback
sanyamc-msft Aug 26, 2015
8d23423
using default wix targets
sanyamc-msft Aug 26, 2015
7974ad4
Adding build.targets
sanyamc-msft Aug 26, 2015
0a848ce
Reverting build.targets changes as my dlls are projects and not dlls …
sanyamc-msft Aug 26, 2015
8d88318
Adding feedback from CR
sanyamc-msft Aug 26, 2015
7f6c793
Using Checked in wix.ca.targets
sanyamc-msft Aug 26, 2015
3003c20
Fixing releasebuild variable and adding csharp target to build .ca.dl…
sanyamc-msft Aug 27, 2015
7ea8a49
Updating with latest changes from master
sanyamc-msft Aug 27, 2015
a6bfc96
Merging files
sanyamc-msft Aug 27, 2015
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Build/Common.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
Condition="'$(CopyOutputsToPath)' != '' and $(MSBuildProjectExtension) != '.wixproj' and Exists($(TargetPath))">
<PropertyGroup>
<CopyOutputsToPath Condition="!HasTrailingSlash($(CopyOutputsToPath))">$(CopyOutputsToPath)\</CopyOutputsToPath>
</PropertyGroup>
</PropertyGroup>

<MakeDir Directories="$(CopyOutputsToPath)UnsignedBinaries;$(CopyOutputsToPath)Symbols"
ContinueOnError="true" />
Expand All @@ -144,7 +144,6 @@

<Copy SourceFiles="@(DebugSymbolsProjectOutputGroupOutput->'%(FinalOutputPath)')"
DestinationFolder="$(CopyOutputsToPath)Symbols" />

<Copy SourceFiles="@(OutputBinariesToSign -> '$(OutputPath)%(filename)%(extension)')"
DestinationFolder="$(CopyOutputsToPath)UnsignedBinaries"
Condition="'@(OutputBinariesToSign)' != ''"/>
Expand Down
4 changes: 4 additions & 0 deletions Nodejs/Prerequisites/DisableSkipVerification.reg
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ Windows Registry Editor Version 5.00
[-HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.NodejsTools,B03F5F7F11D50A3A]
[-HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.NodejsTools.AjaxMin,B03F5F7F11D50A3A]
[-HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.NodejsTools.Analysis,B03F5F7F11D50A3A]
[-HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.NodejsTools.InstallerTelemetryAction,B03F5F7F11D50A3A]
[-HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.NodejsTools.InstallerTelemetryAction.CA,B03F5F7F11D50A3A]
[-HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.NodejsTools.InteractiveWindow,B03F5F7F11D50A3A]
[-HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.NodejsTools.NodeLogConverter,B03F5F7F11D50A3A]
[-HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.NodejsTools.Npm,B03F5F7F11D50A3A]
Expand Down Expand Up @@ -42,6 +44,8 @@ Windows Registry Editor Version 5.00
[-HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\StrongName\Verification\Microsoft.NodejsTools,B03F5F7F11D50A3A]
[-HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\StrongName\Verification\Microsoft.NodejsTools.AjaxMin,B03F5F7F11D50A3A]
[-HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\StrongName\Verification\Microsoft.NodejsTools.Analysis,B03F5F7F11D50A3A]
[-HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\StrongName\Verification\Microsoft.NodejsTools.InstallerTelemetryAction,B03F5F7F11D50A3A]
[-HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\StrongName\Verification\Microsoft.NodejsTools.InstallerTelemetryAction.CA,B03F5F7F11D50A3A]
[-HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\StrongName\Verification\Microsoft.NodejsTools.InteractiveWindow,B03F5F7F11D50A3A]
[-HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\StrongName\Verification\Microsoft.NodejsTools.NodeLogConverter,B03F5F7F11D50A3A]
[-HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\StrongName\Verification\Microsoft.NodejsTools.Npm,B03F5F7F11D50A3A]
Expand Down
2 changes: 2 additions & 0 deletions Nodejs/Prerequisites/DisableSkipVerificationX86.reg
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ Windows Registry Editor Version 5.00
[-HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.NodejsTools,B03F5F7F11D50A3A]
[-HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.NodejsTools.AjaxMin,B03F5F7F11D50A3A]
[-HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.NodejsTools.Analysis,B03F5F7F11D50A3A]
[-HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.NodejsTools.InstallerTelemetryAction,B03F5F7F11D50A3A]
[-HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.NodejsTools.InstallerTelemetryAction.CA,B03F5F7F11D50A3A]
[-HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.NodejsTools.InteractiveWindow,B03F5F7F11D50A3A]
[-HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.NodejsTools.NodeLogConverter,B03F5F7F11D50A3A]
[-HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.NodejsTools.Npm,B03F5F7F11D50A3A]
Expand Down
4 changes: 4 additions & 0 deletions Nodejs/Prerequisites/EnableSkipVerification.reg
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ Windows Registry Editor Version 5.00
[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.NodejsTools,B03F5F7F11D50A3A]
[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.NodejsTools.AjaxMin,B03F5F7F11D50A3A]
[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.NodejsTools.Analysis,B03F5F7F11D50A3A]
[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.NodejsTools.InstallerTelemetryAction,B03F5F7F11D50A3A]
[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.NodejsTools.InstallerTelemetryAction.CA,B03F5F7F11D50A3A]
[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.NodejsTools.InteractiveWindow,B03F5F7F11D50A3A]
[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.NodejsTools.NodeLogConverter,B03F5F7F11D50A3A]
[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.NodejsTools.Npm,B03F5F7F11D50A3A]
Expand Down Expand Up @@ -42,6 +44,8 @@ Windows Registry Editor Version 5.00
[HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\StrongName\Verification\Microsoft.NodejsTools,B03F5F7F11D50A3A]
[HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\StrongName\Verification\Microsoft.NodejsTools.AjaxMin,B03F5F7F11D50A3A]
[HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\StrongName\Verification\Microsoft.NodejsTools.Analysis,B03F5F7F11D50A3A]
[HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\StrongName\Verification\Microsoft.NodejsTools.InstallerTelemetryAction,B03F5F7F11D50A3A]
[HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\StrongName\Verification\Microsoft.NodejsTools.InstallerTelemetryAction.CA,B03F5F7F11D50A3A]
[HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\StrongName\Verification\Microsoft.NodejsTools.InteractiveWindow,B03F5F7F11D50A3A]
[HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\StrongName\Verification\Microsoft.NodejsTools.NodeLogConverter,B03F5F7F11D50A3A]
[HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\StrongName\Verification\Microsoft.NodejsTools.Npm,B03F5F7F11D50A3A]
Expand Down
2 changes: 2 additions & 0 deletions Nodejs/Prerequisites/EnableSkipVerificationX86.reg
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ Windows Registry Editor Version 5.00
[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.NodejsTools,B03F5F7F11D50A3A]
[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.NodejsTools.AjaxMin,B03F5F7F11D50A3A]
[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.NodejsTools.Analysis,B03F5F7F11D50A3A]
[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.NodejsTools.InstallerTelemetryAction,B03F5F7F11D50A3A]
[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.NodejsTools.InstallerTelemetryAction.CA,B03F5F7F11D50A3A]
[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.NodejsTools.InteractiveWindow,B03F5F7F11D50A3A]
[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.NodejsTools.NodeLogConverter,B03F5F7F11D50A3A]
[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.NodejsTools.Npm,B03F5F7F11D50A3A]
Expand Down
4 changes: 3 additions & 1 deletion Nodejs/Prerequisites/generate.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@ var assemblies = [
'Microsoft.NodejsTools.PressAnyKey',
'Microsoft.NodejsTools.Telemetry.11.0',
'Microsoft.NodejsTools.Telemetry.12.0',
'Microsoft.NodejsTools.Telemetry.14.0'
'Microsoft.NodejsTools.Telemetry.14.0',
'Microsoft.NodejsTools.InstallerTelemetryAction.CA',
'Microsoft.NodejsTools.InstallerTelemetryAction'
].sort();

var files = [
Expand Down
4 changes: 3 additions & 1 deletion Nodejs/Setup/BuildRelease.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,9 @@ $managed_files = (
"Microsoft.NodejsTools.PressAnyKey.exe",
"Microsoft.NodejsTools.Telemetry.11.0.dll",
"Microsoft.NodejsTools.Telemetry.12.0.dll",
"Microsoft.NodejsTools.Telemetry.14.0.dll"
"Microsoft.NodejsTools.Telemetry.14.0.dll",
"Microsoft.NodejsTools.InstallerTelemetryAction.CA.dll",
"Microsoft.NodejsTools.InstallerTelemetryAction.dll"
)

$native_files = @()
Expand Down
31 changes: 31 additions & 0 deletions Nodejs/Setup/InstallerTelemetryAction/CustomAction.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<startup useLegacyV2RuntimeActivationPolicy="true">

<!--
Use supportedRuntime tags to explicitly specify the version(s) of the .NET Framework runtime that
the custom action should run on. If no versions are specified, the chosen version of the runtime
will be the "best" match to what Microsoft.Deployment.WindowsInstaller.dll was built against.

WARNING: leaving the version unspecified is dangerous as it introduces a risk of compatibility
problems with future versions of the .NET Framework runtime. It is highly recommended that you specify
only the version(s) of the .NET Framework runtime that you have tested against.

Note for .NET Framework v3.0 and v3.5, the runtime version is still v2.0.

In order to enable .NET Framework version 2.0 runtime activation policy, which is to load all assemblies
by using the latest supported runtime, @useLegacyV2RuntimeActivationPolicy="true".

For more information, see http://msdn.microsoft.com/en-us/library/bbx34a2h.aspx
-->

<supportedRuntime version="v4.0" />
<supportedRuntime version="v2.0.50727"/>
</startup>

<!--
Add additional configuration settings here. For more information on application config files,
see http://msdn.microsoft.com/en-us/library/kza1yk3a.aspx
-->

</configuration>
129 changes: 129 additions & 0 deletions Nodejs/Setup/InstallerTelemetryAction/InstallerTelemetryAction.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
//*********************************************************//
// Copyright (c) Microsoft. All rights reserved.
//
// Apache 2.0 License
//
// You may obtain a copy of the License at
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
// implied. See the License for the specific language governing
// permissions and limitations under the License.
//
//*********************************************************//

using System;
using System.Collections.Generic;
using System.Collections.Specialized;
using System.Diagnostics;
using System.Net;
using System.Text;
using System.Web.Script.Serialization;
using System.Globalization;
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sort usings - First System.*, then everything else.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks did that.

using Microsoft.Deployment.WindowsInstaller;

namespace Microsoft.NodejsTools.Telemetry
{
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Braces on same line here and everywhere else.

public class InstallerTelemetryActions {

[CustomAction]
public static ActionResult RecordInstallStartTime(Session session) {
session["InstallStartTime"] = DateTime.Now.ToString(CultureInfo.InvariantCulture);
return ActionResult.Success;
}

[CustomAction]
public static ActionResult LogInstallSuccessResult(Session session) {
session.Log("Begin Telemetry Log");
LogInstallStatus("Success", session);
session.Log("End Telemetry Log");
return ActionResult.Success;
}

[CustomAction]
public static ActionResult LogInstallErrorResult(Session session) {
session.Log("Begin Telemetry Log");
LogInstallStatus("Error", session);
session.Log("End Telemetry Log");
return ActionResult.Success;
}

[CustomAction]
public static ActionResult LogInstallCancelResult(Session session) {
session.Log("Begin Telemetry Log");
LogInstallStatus("Cancel", session);
session.Log("End Telemetry Log");
return ActionResult.Success;
}

private static void LogInstallStatus(string InstallStatus, Session session)
{
TimeSpan installTime = DateTime.Now - DateTime.Parse(session["InstallStartTime"]);
bool isInstalled = session.EvaluateCondition("Installed");
string currentState = null;
string requestState = null;

FeatureInfoCollection featureInfoCollection = session.Features;
foreach (FeatureInfo featureInfo in featureInfoCollection)
{
currentState = featureInfo.CurrentState.ToString("F");
requestState = featureInfo.RequestState.ToString("F");
// we just want the current and requested state of A feature to understand if its a new user, upgrade, reinstall or remove.
break;
}
session.Log("Starting POST");
Dictionary<string, object> data = new Dictionary<string, object>() {
{
"iKey", "377a3718-78a7-49df-abcc-1001317db729"
}, {
"name", "Microsoft.ApplicationInsights.Event"
}, {
"time", DateTime.Now.ToUniversalTime().ToString(CultureInfo.InvariantCulture)
}, {
"data", new Dictionary <string, object> () {
{
"baseType", "EventData"
}, {
"baseData", new Dictionary <string, object> () {
{
"ver", "2"
}, {
"name", "NtvsInstallerTelemetry"
}, {
"properties", new Dictionary <string, string> () {
{
"InstallStatus", InstallStatus
}, {
"IsNtvsInstalled", isInstalled.ToString(CultureInfo.InvariantCulture)
}, {
"CurrentState", currentState
}, {
"RequestState", requestState
}, {
"NtvsVersion", session["NtvsVersion"]
}, {
"VSVersion", session["VSVersion"]
}, {
"MsiVersion", session["MsiVersion"]
}, {
"TimeTakenInSeconds", installTime.TotalSeconds.ToString(CultureInfo.InvariantCulture)
}
}
}
}
}
}
}
};
string jsonString = (new JavaScriptSerializer()).Serialize(data);
using (WebClient client = new WebClient())
{
string response = client.UploadString("https://dc.services.visualstudio.com/v2/track", jsonString);
session.Log(response);
}
}

}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Choose>
<When Condition=" '$(VisualStudioVersion)'=='14.0' Or '$(TargetVisualStudioVersion)'=='VS140' ">
<PropertyGroup>
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>4.0</OldToolsVersion>
</PropertyGroup>
</When>
<When Condition=" '$(VisualStudioVersion)'=='12.0' Or '$(TargetVisualStudioVersion)'=='VS120' ">
<PropertyGroup>
<MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>4.0</OldToolsVersion>
</PropertyGroup>
</When>
<When Condition=" '$(VisualStudioVersion)'=='11.0' Or '$(TargetVisualStudioVersion)'=='VS110' ">
<PropertyGroup>
<MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>4.0</OldToolsVersion>
</PropertyGroup>
</When>
</Choose>
<Import Project="..\SetupProjectBefore.settings" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{775E686D-C646-4DAB-9DCF-D2C37FF8EA78}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Microsoft.NodejsTools.Telemetry</RootNamespace>
<AssemblyName>Microsoft.NodejsTools.InstallerTelemetryAction</AssemblyName>
<WixCATargetsPath Condition=" '$(WixCATargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.CA.targets</WixCATargetsPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Xml.Linq" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Xml" />
<Reference Include="Microsoft.Deployment.WindowsInstaller">
<Private>True</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="InstallerTelemetryAction.cs" />
<Content Include="CustomAction.config" />
</ItemGroup>
<Import Project="$(BuildRoot)\Build\Common.Build.CSharp.targets" />
<Import Project="$(WixCATargetsPath)" />
<Import Project="..\SetupProjectAfter.settings" />
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@
<SccProvider>SAK</SccProvider>
<SccAuxPath>SAK</SccAuxPath>
<SccLocalPath>SAK</SccLocalPath>
<DefineConstants>
$(DefineConstants);
ReleaseBuild=$(ReleaseBuild)
</DefineConstants>
<DefineConstants Condition="$(VSTarget) == '12.0'">
$(DefineConstants);
IncludeVWDExpress=12.0.30219.0;
Expand Down Expand Up @@ -52,6 +56,10 @@
<Content Include="NodejsToolsInstallerVars.wxi" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\InstallerTelemetryAction\InstallerTelemetryAction.csproj" Condition="'$(ReleaseBuild)' == 'True'" >
<Name>InstallerTelemetryAction</Name>
<Project>{775e686d-c646-4dab-9dcf-d2c37ff8ea78}</Project>
</ProjectReference>
<ProjectReference Include="..\InteractiveWindow\InteractiveWindow.wixproj">
<Name>InteractiveWindow</Name>
<Project>{C0D64130-C0E9-4CAB-99BC-68F62357F010}</Project>
Expand Down
Loading