Skip to content

Use signed webrole.dll for VS15 #1200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 27 commits into from
Aug 10, 2016
Merged

Use signed webrole.dll for VS15 #1200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
e932707
Use signed version of webrole.dll
mjbvz Aug 8, 2016
be0b062
Use full path for CopyOutputsToPath
mjbvz Aug 8, 2016
8540ba2
Use WebRoleDllPath based on existance of SignedBinariesPath
mjbvz Aug 8, 2016
284724e
Delete custom target for targets build
mjbvz Aug 8, 2016
775ac55
pull webrole from webrole binaries
mjbvz Aug 8, 2016
83b63be
Revert removal of _CopyWixOutputsToPath
mjbvz Aug 8, 2016
c31841f
Add a few debug messages
mjbvz Aug 9, 2016
e83a1b9
Remove reference to swix from setup files
mjbvz Aug 9, 2016
3dd2ef0
Remove correct line in dirs.proj
mjbvz Aug 9, 2016
d2fbc31
revert dirs.proj changes
mjbvz Aug 9, 2016
5cfb785
Try adding custom MSBuildAllProjects path to trigger rebuild
mjbvz Aug 9, 2016
10e00d5
Clean up change and remove log statements
mjbvz Aug 9, 2016
3115af7
Swtich to force clean build root output
mjbvz Aug 9, 2016
bc68ea3
Fix WebRoleDll paths
mjbvz Aug 9, 2016
b82fc77
Redo dirs.proj change
mjbvz Aug 9, 2016
d5a9d36
Restore workaround to retrigger build and revert dirs.proj change
mjbvz Aug 9, 2016
0875988
Use buildversion variable instead of hardcoded 1.2 version for vsix p…
mjbvz Aug 9, 2016
515a403
Use build.buildnumber instead
mjbvz Aug 9, 2016
50ec657
Merge pull request #1198 from mjbvz/lightweight-version-update
mjbvz Aug 9, 2016
6cfbed1
Use custom defined buildversion
mjbvz Aug 9, 2016
5721b41
Update other swix files
mjbvz Aug 9, 2016
6fdf2a9
Use custom defined buildversion (#1199)
mjbvz Aug 9, 2016
1111e58
Use MsiVersion instead of custom version logic
mjbvz Aug 9, 2016
367d32f
Merge
mjbvz Aug 9, 2016
a0dca0a
REmove custom build logic
mjbvz Aug 9, 2016
930ce34
Merge branch 'master' into lightweight-install
mjbvz Aug 9, 2016
b309296
Merge remote-tracking branch 'Microsoft/master' into lightweight-install
mjbvz Aug 9, 2016
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
2 changes: 1 addition & 1 deletion Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.InteractiveWindow.swixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<PropertyGroup>
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(Build.BuildNumber)</PackagePreprocessorDefinitions>
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(MsiVersion)</PackagePreprocessorDefinitions>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.NodejsTools.swixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<PropertyGroup>
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(Build.BuildNumber)</PackagePreprocessorDefinitions>
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(MsiVersion)</PackagePreprocessorDefinitions>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Profiling.swixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<PropertyGroup>
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(Build.BuildNumber)</PackagePreprocessorDefinitions>
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(MsiVersion)</PackagePreprocessorDefinitions>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<TargetPath>$(BuildOutputRoot)Setup\Microsoft.VisualStudio.NodejsTools.Targets.vsix</TargetPath>
<WebRoleDll Condition="'$(SignedBinariesPath)' != ''">$(SignedBinariesPath)\Microsoft.NodejsTools.WebRole.dll</WebRoleDll>
<WebRoleDll Condition="'$(SignedBinariesPath)' == ''">$(BuildOutputRoot)\Binaries\WebRole\Microsoft.NodejsTools.WebRole.dll</WebRoleDll>
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(Build.BuildNumber);WebRoleDll=$(WebRoleDll)</PackagePreprocessorDefinitions>
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(MsiVersion);WebRoleDll=$(WebRoleDll)</PackagePreprocessorDefinitions>
<!--Retrigger a build on webrole.dll to pick up signed version. TODO: see if there's a better way to do this.-->
<MSBuildAllProjects>$(WebRoleDll)</MSBuildAllProjects>
</PropertyGroup>
Expand Down