Skip to content

Commit 328cd80

Browse files
david-driscolldavid-driscoll
committed
Updated project references and build script, also added secure nuget keys
1 parent e07488a commit 328cd80

File tree

6 files changed

+110
-117
lines changed

6 files changed

+110
-117
lines changed

‎.appveyor.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
image: Visual Studio 2017
2+
environment:
3+
nuget_org_apikey:
4+
secure: lFaEHVRMsSWTveDH/DuLl4+hv+O0i4qLkbhW3aCgzq0oCrOuV+0TSEkqe6aiHuNX
5+
myget_apikey:
6+
secure: eoBrSWDtOXSxyUOoCSTyQCeDkvU18W67pE3w26viEUBRi1K4Tru0cTjUtDUB7l9V
27
build_script:
38
- ps: .\build.ps1
49
test: off
@@ -10,3 +15,27 @@ artifacts:
1015
- path: ./artifacts/nuget/*.nupkg
1116
nuget:
1217
project_feed: true
18+
deploy:
19+
- provider: NuGet
20+
server: https://www.myget.org/F/omnisharp/api/v3/index.json
21+
api_key:
22+
secure: eoBrSWDtOXSxyUOoCSTyQCeDkvU18W67pE3w26viEUBRi1K4Tru0cTjUtDUB7l9V
23+
skip_symbols: true
24+
artifact: /.*\.nupkg/
25+
on:
26+
branch: master
27+
- provider: NuGet
28+
api_key:
29+
secure: lFaEHVRMsSWTveDH/DuLl4+hv+O0i4qLkbhW3aCgzq0oCrOuV+0TSEkqe6aiHuNX
30+
skip_symbols: false
31+
artifact: /.*\.nupkg/
32+
on:
33+
appveyor_repo_tag: true
34+
- provider: NuGet
35+
server: https://www.myget.org/F/omnisharp/api/v3/index.json
36+
api_key:
37+
secure: eoBrSWDtOXSxyUOoCSTyQCeDkvU18W67pE3w26viEUBRi1K4Tru0cTjUtDUB7l9V
38+
skip_symbols: true
39+
artifact: /.*\.nupkg/
40+
on:
41+
appveyor_repo_tag: true

‎build.cake

Lines changed: 37 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -55,50 +55,35 @@ Task("Test")
5555

5656
Task("Coverage")
5757
//.IsDependentOn("Build")
58-
.Does(() =>
58+
.Does(() => {
59+
CleanDirectory(artifacts + "/coverage");
60+
EnsureDirectoryExists(artifacts + "/coverage");
61+
})
62+
.DoesForEach(GetFiles("test/*/*.csproj"), (testProject) =>
5963
{
60-
CleanDirectory(artifacts + "/coverage");
61-
EnsureDirectoryExists(artifacts + "/coverage");
62-
63-
foreach (var testProject in GetFiles("test/*/*.csproj")) {
64-
DotCoverCover(tool => {
65-
// tool.XUnit2()
66-
// tool.StartProcess(Context.Tools.Resolve("dotnet.exe"), new ProcessSettings() {
67-
// WorkingDirectory = testProject.GetDirectory(),
68-
// Arguments = new ProcessArgumentBuilder()
69-
// .Append("test")
70-
// .AppendSwitch("-c", configuration)
71-
// .Append("--no-build")
72-
// .Append("-f net46")
73-
// });
74-
tool.StartProcess(Context.Tools.Resolve("dotnet.exe"), new ProcessSettings() {
75-
WorkingDirectory = testProject.GetDirectory(),
76-
EnvironmentVariables = GitVersionEnvironmentVariables,
77-
Arguments = new ProcessArgumentBuilder()
78-
.Append("xunit")
79-
.Append("-noshadow")
80-
.Append("-noautoreporters")
81-
// .AppendSwitch("-maxthreads", "1")
82-
.AppendSwitch("-configuration", configuration)
83-
.AppendSwitch("-framework", "net46")
84-
.AppendSwitchQuotedSecret("-xml", string.Format("{0}/tests/{1}.xml", artifacts, testProject.GetFilenameWithoutExtension()))
85-
.AppendSwitchQuotedSecret("-html", string.Format("{0}/tests/{1}.html", artifacts, testProject.GetFilenameWithoutExtension()))
86-
});
87-
},
88-
artifacts + "/coverage/coverage-"+ testProject.GetFilenameWithoutExtension() + ".dcvr",
89-
new DotCoverCoverSettings() {
90-
// Register = "user",
91-
// MergeOutput = true,
92-
// OldStyle = true,
93-
TargetWorkingDir = testProject.GetDirectory(),
94-
WorkingDirectory = testProject.GetDirectory(),
95-
// ReportType = DotCoverReportType.XML
96-
}
97-
.WithFilter("+:JsonRpc")
98-
.WithFilter("+:Lsp")
99-
);
100-
}
101-
64+
DotCoverCover(tool => {
65+
tool.DotNetCoreTool(
66+
testProject.GetDirectory().FullPath,
67+
"xunit",
68+
new ProcessArgumentBuilder()
69+
.AppendSwitchQuoted("-xml", string.Format("{0}/tests/{1}.xml", artifacts, testProject.GetFilenameWithoutExtension()))
70+
.AppendSwitch("-configuration", configuration)
71+
.Append("-noshadow"),
72+
new DotNetCoreToolSettings() {
73+
EnvironmentVariables = GitVersionEnvironmentVariables,
74+
});
75+
},
76+
artifacts + "/coverage/coverage-"+ testProject.GetFilenameWithoutExtension() + ".dcvr",
77+
new DotCoverCoverSettings() {
78+
TargetWorkingDir = testProject.GetDirectory(),
79+
WorkingDirectory = testProject.GetDirectory(),
80+
EnvironmentVariables = GitVersionEnvironmentVariables,
81+
}
82+
.WithFilter("+:JsonRpc")
83+
.WithFilter("+:Lsp")
84+
);
85+
})
86+
.Finally(() => {
10287
DotCoverMerge(
10388
GetFiles(artifacts + "/coverage/*.dcvr"),
10489
artifacts + "/coverage/coverage.dcvr"
@@ -126,16 +111,15 @@ Task("Coverage")
126111

127112
Task("Pack")
128113
.IsDependentOn("Build")
129-
.Does(() => {
130-
EnsureDirectoryExists(artifacts + "/nuget");
131-
foreach (var project in GetFiles("src/*/*.csproj"))
132-
DotNetCorePack(project.FullPath, new DotNetCorePackSettings
133-
{
134-
NoBuild = true,
135-
Configuration = configuration,
136-
EnvironmentVariables = GitVersionEnvironmentVariables,
137-
OutputDirectory = artifacts + "/nuget"
138-
});
114+
.Does(() => EnsureDirectoryExists(artifacts + "/nuget"))
115+
.DoesForEach(GetFiles("src/*/*.csproj"), (project) => {
116+
DotNetCorePack(project.FullPath, new DotNetCorePackSettings
117+
{
118+
NoBuild = true,
119+
Configuration = configuration,
120+
EnvironmentVariables = GitVersionEnvironmentVariables,
121+
OutputDirectory = artifacts + "/nuget"
122+
});
139123
});
140124

141125
Task("GitVersion")

‎src/JsonRpc/JsonRpc.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<TargetFrameworks>net46;netstandard1.6</TargetFrameworks>
44
<PlatformTarget>AnyCPU</PlatformTarget>
55
<!-- Needed for Microsoft.Composition -->
6-
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dotnet5.4;portable-net45+win8</PackageTargetFallback>
6+
<AssetTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(AssetTargetFallback);dotnet5.4;portable-net45+win8</AssetTargetFallback>
77
<PackageVersion Condition="'$(GitVersion_NuGetVersion)' != ''">$(GitVersion_NuGetVersion)</PackageVersion>
88
<AssemblyVersion Condition="'$(GitVersion_AssemblySemVer)' != ''">$(GitVersion_AssemblySemVer)</AssemblyVersion>
99
<FileVersion Condition="'$(GitVersion_AssemblySemVer)' != ''">$(GitVersion_AssemblySemVer)</FileVersion>

‎src/Lsp/Lsp.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<TargetFrameworks>net46;netstandard1.6</TargetFrameworks>
44
<PlatformTarget>AnyCPU</PlatformTarget>
55
<!-- Needed for Microsoft.Composition -->
6-
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dotnet5.4;portable-net45+win8</PackageTargetFallback>
6+
<AssetTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(AssetTargetFallback);dotnet5.4;portable-net45+win8</AssetTargetFallback>
77
</PropertyGroup>
88
<ItemGroup>
99
<PackageReference Include="Newtonsoft.Json" Version="10.0.2" />

‎test/JsonRpc.Tests/JsonRpc.Tests.csproj

Lines changed: 19 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,21 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<TargetFrameworks>net46;netcoreapp1.1</TargetFrameworks>
4-
<WarningsAsErrors>true</WarningsAsErrors>
5-
<PlatformTarget>AnyCPU</PlatformTarget>
6-
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
7-
<PackageTargetFallback>$(PackageTargetFallback);dotnet5.4;portable-net45+win8</PackageTargetFallback>
8-
</PropertyGroup>
9-
10-
<ItemGroup>
11-
<ProjectReference Include="..\..\src\JsonRpc\JsonRpc.csproj" />
12-
</ItemGroup>
13-
14-
<ItemGroup>
15-
<PackageReference Include="FluentAssertions" Version="4.19.2" />
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
17-
<PackageReference Include="NSubstitute" Version="2.0.2" />
18-
<PackageReference Include="xunit" Version="2.3.0-beta1-build3642" />
19-
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta1-build1309" />
20-
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0-beta1-build3642" />
21-
<PackageReference Include="Microsoft.CodeCoverage" Version="1.0.3" />
22-
</ItemGroup>
23-
24-
<ItemGroup>
25-
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
26-
</ItemGroup>
27-
28-
<ItemGroup>
29-
<Folder Include="Properties\" />
30-
</ItemGroup>
2+
<PropertyGroup>
3+
<TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
4+
<WarningsAsErrors>true</WarningsAsErrors>
5+
<PlatformTarget>AnyCPU</PlatformTarget>
6+
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
7+
<AssetTargetFallback>$(AssetTargetFallback);dotnet5.4;portable-net45+win8</AssetTargetFallback>
8+
</PropertyGroup>
9+
<ItemGroup>
10+
<ProjectReference Include="..\..\src\JsonRpc\JsonRpc.csproj" />
11+
</ItemGroup>
12+
<ItemGroup>
13+
<PackageReference Include="FluentAssertions" Version="4.19.2" />
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
15+
<PackageReference Include="NSubstitute" Version="2.0.2" />
16+
<PackageReference Include="xunit" Version="2.3.0-beta1-build3642" />
17+
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta1-build1309" />
18+
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0-beta1-build3642" />
19+
<PackageReference Include="Microsoft.CodeCoverage" Version="1.0.3" />
20+
</ItemGroup>
3121
</Project>

‎test/Lsp.Tests/Lsp.Tests.csproj

Lines changed: 23 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,25 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<TargetFrameworks>net46;netcoreapp1.1</TargetFrameworks>
4-
<WarningsAsErrors>true</WarningsAsErrors>
5-
<PlatformTarget>AnyCPU</PlatformTarget>
6-
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
7-
<PackageTargetFallback>$(PackageTargetFallback);dotnet5.4;portable-net45+win8</PackageTargetFallback>
8-
</PropertyGroup>
9-
<ItemGroup>
10-
<None Remove="**\*.json" />
11-
<EmbeddedResource Include="**\*.json" />
12-
</ItemGroup>
13-
14-
<ItemGroup>
15-
<ProjectReference Include="..\..\src\Lsp\Lsp.csproj" />
16-
</ItemGroup>
17-
18-
<ItemGroup>
19-
<PackageReference Include="FluentAssertions" Version="4.19.2" />
20-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
21-
<PackageReference Include="NSubstitute" Version="2.0.2" />
22-
<PackageReference Include="xunit" Version="2.3.0-beta1-build3642" />
23-
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta1-build1309" />
24-
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0-beta1-build3642" />
25-
<PackageReference Include="Microsoft.CodeCoverage" Version="1.0.3" />
26-
</ItemGroup>
27-
28-
<ItemGroup>
29-
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
30-
</ItemGroup>
31-
32-
<ItemGroup>
33-
<Folder Include="Properties\" />
34-
</ItemGroup>
2+
<PropertyGroup>
3+
<TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
4+
<WarningsAsErrors>true</WarningsAsErrors>
5+
<PlatformTarget>AnyCPU</PlatformTarget>
6+
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
7+
<AssetTargetFallback>$(AssetTargetFallback);dotnet5.4;portable-net45+win8</AssetTargetFallback>
8+
</PropertyGroup>
9+
<ItemGroup>
10+
<None Remove="**\*.json" />
11+
<EmbeddedResource Include="**\*.json" />
12+
</ItemGroup>
13+
<ItemGroup>
14+
<ProjectReference Include="..\..\src\Lsp\Lsp.csproj" />
15+
</ItemGroup>
16+
<ItemGroup>
17+
<PackageReference Include="FluentAssertions" Version="4.19.2" />
18+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
19+
<PackageReference Include="NSubstitute" Version="2.0.2" />
20+
<PackageReference Include="xunit" Version="2.3.0-beta1-build3642" />
21+
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta1-build1309" />
22+
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0-beta1-build3642" />
23+
<PackageReference Include="Microsoft.CodeCoverage" Version="1.0.3" />
24+
</ItemGroup>
3525
</Project>

0 commit comments

Comments
 (0)