File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 66
77namespace Jenkins . NET . Publishing
88{
9- public class Build_Win : IBuildTask
9+ public class Build_Windows : IBuildTask
1010 {
1111 public IAgentBuildContext Context { get ; set ; }
1212
@@ -20,8 +20,11 @@ public async Task RunAsync(CancellationToken token)
2020
2121 private async Task BuildSolution ( )
2222 {
23+ var msbuild_exe = Context . AgentVariables [ "global" ] [ "msbuild_exe" ] ;
24+
2325 var msBuild = new MsBuild ( Context ) {
24- Exe = ".\\ bin\\ msbuild.cmd" ,
26+ //Exe = ".\\bin\\msbuild.cmd",
27+ Exe = $ "\" { msbuild_exe } \" ",
2528 Filename = "Jenkins.NET.sln" ,
2629 Configuration = "Release" ,
2730 Platform = "Any CPU" ,
Original file line number Diff line number Diff line change 9393 </ItemGroup >
9494 <ItemGroup >
9595 <Compile Include =" Build_Linux.cs" />
96- <Compile Include =" Publish_Win .cs" />
97- <Compile Include =" Build_Win .cs" />
96+ <Compile Include =" Publish_Windows .cs" />
97+ <Compile Include =" Build_Windows .cs" />
9898 <Compile Include =" Internal\MsBuild.cs" />
9999 <Compile Include =" Properties\AssemblyInfo.cs" />
100100 </ItemGroup >
Original file line number Diff line number Diff line change 11using Jenkins . NET . Publishing . Internal ;
22using Photon . Framework . Agent ;
33using Photon . Framework . Tasks ;
4+ using Photon . Framework . Tools ;
45using Photon . NuGetPlugin ;
56using System . IO ;
67using System . Threading ;
78using System . Threading . Tasks ;
8- using Photon . Framework . Tools ;
99
1010namespace Jenkins . NET . Publishing
1111{
12- public class Publish_Win : IBuildTask
12+ public class Publish_Windows : IBuildTask
1313 {
1414 public IAgentBuildContext Context { get ; set ; }
1515
@@ -23,8 +23,11 @@ public async Task RunAsync(CancellationToken token)
2323
2424 private async Task BuildSolution ( CancellationToken token )
2525 {
26+ var msbuild_exe = Context . AgentVariables [ "global" ] [ "msbuild_exe" ] ;
27+
2628 var msBuild = new MsBuild ( Context ) {
27- Exe = ".\\ bin\\ msbuild.cmd" ,
29+ //Exe = ".\\bin\\msbuild.cmd",
30+ Exe = $ "\" { msbuild_exe } \" ",
2831 Filename = "Jenkins.NET.sln" ,
2932 Configuration = "Release" ,
3033 Platform = "Any CPU" ,
Original file line number Diff line number Diff line change 22using System . Runtime . CompilerServices ;
33using System . Runtime . InteropServices ;
44
5- [ assembly: AssemblyVersion ( "0.4.1 " ) ]
6- [ assembly: AssemblyFileVersion ( "0.4.1 " ) ]
5+ [ assembly: AssemblyVersion ( "0.4.2 " ) ]
6+ [ assembly: AssemblyFileVersion ( "0.4.2 " ) ]
77[ assembly: AssemblyTitle ( "Jenkins.NET" ) ]
88[ assembly: AssemblyDescription ( "C# .NET wrapper for Jenkins HTTP/REST API." ) ]
99[ assembly: AssemblyConfiguration ( "" ) ]
1010[ assembly: AssemblyCompany ( "Joshua Miller" ) ]
1111[ assembly: AssemblyProduct ( "Jenkins.NET" ) ]
12- [ assembly: AssemblyCopyright ( "Copyright © Joshua Miller 2017 " ) ]
12+ [ assembly: AssemblyCopyright ( "Copyright © Joshua Miller 2018 " ) ]
1313[ assembly: AssemblyTrademark ( "" ) ]
1414[ assembly: AssemblyCulture ( "" ) ]
1515
Original file line number Diff line number Diff line change 1+ " %~dp0 nuget.exe" restore " %~dp0 ..\Jenkins.NET.sln"
2+ if not %errorlevel% == 0 exit %errorlevel%
3+
4+ set msbuild_exe = " C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin\MSBuild.exe"
5+ %msbuild_exe% " %~dp0 ..\Jenkins.NET.Publishing\Jenkins.NET.Publishing.csproj" /t:Rebuild /p:Configuration=" Debug" /p:Platform=" Any CPU" /p:OutputPath=" bin\Debug" /v:m
6+ if not %errorlevel% == 0 exit %errorlevel%
You can’t perform that action at this time.
0 commit comments