Skip to content
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

correct appveyor builds #260

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

correct appveyor builds #260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 0 additions & 2 deletions PoorMansTSqlFormatter.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,13 +224,11 @@ Global
{A160C033-3357-4BBB-9BF6-7B7D9971AD65}.Debug|PureDotNet.ActiveCfg = Debug|Any CPU
{A160C033-3357-4BBB-9BF6-7B7D9971AD65}.Debug|PureDotNet.Build.0 = Debug|Any CPU
{A160C033-3357-4BBB-9BF6-7B7D9971AD65}.Debug|x64.ActiveCfg = Debug|Any CPU
{A160C033-3357-4BBB-9BF6-7B7D9971AD65}.Debug|x64.Build.0 = Debug|Any CPU
{A160C033-3357-4BBB-9BF6-7B7D9971AD65}.Debug|x86.ActiveCfg = Debug|Any CPU
{A160C033-3357-4BBB-9BF6-7B7D9971AD65}.Debug|x86.Build.0 = Debug|Any CPU
{A160C033-3357-4BBB-9BF6-7B7D9971AD65}.Release|PureDotNet.ActiveCfg = Release|Any CPU
{A160C033-3357-4BBB-9BF6-7B7D9971AD65}.Release|PureDotNet.Build.0 = Release|Any CPU
{A160C033-3357-4BBB-9BF6-7B7D9971AD65}.Release|x64.ActiveCfg = Release|Any CPU
{A160C033-3357-4BBB-9BF6-7B7D9971AD65}.Release|x64.Build.0 = Release|Any CPU
{A160C033-3357-4BBB-9BF6-7B7D9971AD65}.Release|x86.ActiveCfg = Release|Any CPU
{A160C033-3357-4BBB-9BF6-7B7D9971AD65}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
Expand Down
4 changes: 1 addition & 3 deletions PoorMansTSqlFormatterSSMSPackage/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,8 @@ You should have received a copy of the GNU Affero General Public License
[assembly: AssemblyCulture("")]
[assembly: AssemblyVersion("1.6.16.*")]
[assembly: AssemblyDelaySign(false)]
[assembly: AssemblyKeyFile("")]
[assembly: AssemblyKeyName("")]

[assembly: ComVisible(false)]
[assembly: ComVisible(false)]
[assembly: CLSCompliant(false)]
[assembly: NeutralResourcesLanguage("en-US")]

Expand Down
4 changes: 1 addition & 3 deletions PoorMansTSqlFormatterVSPackage2013/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,8 @@ You should have received a copy of the GNU Affero General Public License
[assembly: AssemblyCulture("")]
[assembly: AssemblyVersion("1.6.16.*")]
[assembly: AssemblyDelaySign(false)]
[assembly: AssemblyKeyFile("")]
[assembly: AssemblyKeyName("")]

[assembly: ComVisible(false)]
[assembly: ComVisible(false)]
[assembly: CLSCompliant(false)]
[assembly: NeutralResourcesLanguage("en-US")]

Expand Down
2 changes: 0 additions & 2 deletions PoorMansTSqlFormatterVSPackage2019/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ You should have received a copy of the GNU Affero General Public License
[assembly: AssemblyCulture("")]
[assembly: AssemblyVersion("1.6.16.*")]
[assembly: AssemblyDelaySign(false)]
[assembly: AssemblyKeyFile("")]
[assembly: AssemblyKeyName("")]

[assembly: ComVisible(false)]
[assembly: CLSCompliant(false)]
Expand Down
34 changes: 18 additions & 16 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ image: Visual Studio 2017

environment:
matrix:
- PlatformToolset: v140_xp
- PlatformToolset: v141_xp

platform:
- x64
Expand All @@ -17,38 +17,40 @@ configuration:

install:
- if "%platform%"=="x64" set archi=amd64
- if "%platform%"=="x64" set platform_input=x64

- if "%platform%"=="x86" set archi=x86
- call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %archi%
- if "%platform%"=="x86" set platform_input=x86

- if "%platform%"=="PureDotNet" set archi=amd64
- if "%platform%"=="PureDotNet" set platform_input=PureDotNet

build:
parallel: true # enable MSBuild parallel builds
verbosity: minimal
- call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" %archi%

build_script:
- cd "%APPVEYOR_BUILD_FOLDER%"
- msbuild PoorMansTSqlFormatter.sln /m /p:configuration="%configuration%" /p:platform="%platform%" /p:PlatformToolset="%PlatformToolset%" /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
- msbuild PoorMansTSqlFormatter.sln /m /p:configuration="%configuration%" /p:platform="%platform_input%" /p:PlatformToolset="%PlatformToolset%" /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"

after_build:
- cd "%APPVEYOR_BUILD_FOLDER%"
- ps: >-

if ($env:PLATFORM -eq "x64" -and $env:CONFIGURATION -eq "Release") {
Push-AppveyorArtifact "PoorMansTSqlFormatterNppPlugin\bin\$env:PLATFORM\$env:CONFIGURATION\PoorMansTSqlFormatterNppPlugin.dll" -FileName PoorMansTSqlFormatterNppPlugin.dll
if ($env:PLATFORM_INPUT -eq "x64" -and $env:CONFIGURATION -eq "Release") {
Push-AppveyorArtifact "PoorMansTSqlFormatterNppPlugin\bin\$env:PLATFORM_INPUT\$env:CONFIGURATION\PoorMansTSqlFormatterNppPlugin.dll" -FileName PoorMansTSqlFormatterNppPlugin.dll
}

if ($env:PLATFORM -eq "x86" -and $env:CONFIGURATION -eq "Release") {
Push-AppveyorArtifact "PoorMansTSqlFormatterNppPlugin\bin\$env:PLATFORM\$env:CONFIGURATION\PoorMansTSqlFormatterNppPlugin.dll" -FileName PoorMansTSqlFormatterNppPlugin.dll
if ($env:PLATFORM_INPUT -eq "x86" -and $env:CONFIGURATION -eq "Release") {
Push-AppveyorArtifact "PoorMansTSqlFormatterNppPlugin\bin\$env:PLATFORM_INPUT\$env:CONFIGURATION\PoorMansTSqlFormatterNppPlugin.dll" -FileName PoorMansTSqlFormatterNppPlugin.dll
}

if ($($env:APPVEYOR_REPO_TAG) -eq "true" -and $env:CONFIGURATION -eq "Release" -and $env:PLATFORMTOOLSET -eq "v140_xp") {
if($env:PLATFORM -eq "x64"){
if ($($env:APPVEYOR_REPO_TAG) -eq "true" -and $env:CONFIGURATION -eq "Release" -and $env:PLATFORMTOOLSET -eq "v141_xp") {
if($env:PLATFORM_INPUT -eq "x64"){
$ZipFileName = "PoorMansTSqlFormatterNppPlugin_$($env:APPVEYOR_REPO_TAG_NAME)_x64.zip"
7z a $ZipFileName PoorMansTSqlFormatterNppPlugin\bin\$env:PLATFORM\$env:CONFIGURATION\PoorMansTSqlFormatterNppPlugin.dll
7z a $ZipFileName PoorMansTSqlFormatterNppPlugin\bin\$env:PLATFORM_INPUT\$env:CONFIGURATION\PoorMansTSqlFormatterNppPlugin.dll
}
if($env:PLATFORM -eq "x86"){
if($env:PLATFORM_INPUT -eq "x86"){
$ZipFileName = "PoorMansTSqlFormatterNppPlugin_$($env:APPVEYOR_REPO_TAG_NAME)_x86.zip"
7z a $ZipFileName PoorMansTSqlFormatterNppPlugin\bin\$env:PLATFORM\$env:CONFIGURATION\PoorMansTSqlFormatterNppPlugin.dll
7z a $ZipFileName PoorMansTSqlFormatterNppPlugin\bin\$env:PLATFORM_INPUT\$env:CONFIGURATION\PoorMansTSqlFormatterNppPlugin.dll
}
}

Expand All @@ -66,5 +68,5 @@ deploy:
force_update: true
on:
appveyor_repo_tag: true
PlatformToolset: v140_xp
PlatformToolset: v141_xp
configuration: Release
9 changes: 9 additions & 0 deletions ...Studio.Sdk.BuildTasks.14.0.14.9.23/build/Microsoft.VisualStudio.Sdk.BuildTasks.14.0.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="VSSDK_NuGet_Configuration">
<ThisPackageDirectory>$(MSBuildThisFileDirectory)..\</ThisPackageDirectory>
<VSToolsPath>$(ThisPackageDirectory)\tools</VSToolsPath>
<VsSDKInstall>$(VSToolsPath)\VSSDK</VsSDKInstall>
<VsSDKIncludes>$(VsSDKInstall)\inc</VsSDKIncludes>
<VsSDKToolsPath>$(VsSDKInstall)\bin</VsSDKToolsPath>
</PropertyGroup>
</Project>
18 changes: 18 additions & 0 deletions ...udio.Sdk.BuildTasks.14.0.14.9.23/build/Microsoft.VisualStudio.Sdk.BuildTasks.14.0.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<UsingTask TaskName="SetVsSDKEnvironmentVariables" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
<ParameterGroup>
<ProjectDirectory Required="true" />
</ParameterGroup>
<Task>
<Code Type="Fragment" Language="cs">
System.Environment.SetEnvironmentVariable("VsSDKToolsPath", System.IO.Path.GetFullPath(ProjectDirectory + @"\..\tools\VSSDK\bin"),EnvironmentVariableTarget.Process);
System.Environment.SetEnvironmentVariable("LegacyVsSDKSchemaDir", System.IO.Path.GetFullPath(ProjectDirectory + @"\..\tools\VSSDK\schemas\legacy"),EnvironmentVariableTarget.Process);
System.Environment.SetEnvironmentVariable("VsSDKSchemaDir", System.IO.Path.GetFullPath(ProjectDirectory + @"\..\tools\VSSDK\schemas\v3"),EnvironmentVariableTarget.Process);
</Code>
</Task>
</UsingTask>
<Target Name="SetVsSDKEnvironmentVariables" BeforeTargets="GeneratePkgDef;VSCTCompile;VSIXNameProjectOutputGroup">
<SetVsSDKEnvironmentVariables ProjectDirectory="$(MSBuildThisFileDirectory)" />
</Target>
</Project>
Loading