diff --git a/nuget.config b/nuget.config index d4d5425..8fca989 100644 --- a/nuget.config +++ b/nuget.config @@ -4,5 +4,6 @@ + diff --git a/src/Steeltoe.Management.EndpointOwin/Info/InfoEndpointAppBuilderExtensions.cs b/src/Steeltoe.Management.EndpointOwin/Info/InfoEndpointAppBuilderExtensions.cs index c33bb29..8e10c0a 100644 --- a/src/Steeltoe.Management.EndpointOwin/Info/InfoEndpointAppBuilderExtensions.cs +++ b/src/Steeltoe.Management.EndpointOwin/Info/InfoEndpointAppBuilderExtensions.cs @@ -19,6 +19,7 @@ using Steeltoe.Management.Endpoint.Info.Contributor; using System; using System.Collections.Generic; +using System.IO; using System.Net.Http; namespace Steeltoe.Management.EndpointOwin.Info @@ -79,9 +80,10 @@ public static IAppBuilder UseInfoActuator(this IAppBuilder builder, IConfigurati private static IList GetDefaultInfoContributors(IConfiguration config, ILoggerFactory loggerFactory = null) { + var gitInfoPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "git.properties"); return new List { - new GitInfoContributor(AppDomain.CurrentDomain.BaseDirectory + "\\git.properties", loggerFactory?.CreateLogger()), + new GitInfoContributor(gitInfoPath, loggerFactory?.CreateLogger()), new AppSettingsInfoContributor(config) }; } diff --git a/src/Steeltoe.Management.EndpointOwin/Steeltoe.Management.EndpointOwin.csproj b/src/Steeltoe.Management.EndpointOwin/Steeltoe.Management.EndpointOwin.csproj index 2b82c15..fbde480 100644 --- a/src/Steeltoe.Management.EndpointOwin/Steeltoe.Management.EndpointOwin.csproj +++ b/src/Steeltoe.Management.EndpointOwin/Steeltoe.Management.EndpointOwin.csproj @@ -14,6 +14,9 @@ https://steeltoe.io https://www.apache.org/licenses/LICENSE-2.0 + + + diff --git a/src/Steeltoe.Management.EndpointOwinAutofac/Steeltoe.Management.EndpointOwinAutofac.csproj b/src/Steeltoe.Management.EndpointOwinAutofac/Steeltoe.Management.EndpointOwinAutofac.csproj index a59e94c..ef361c6 100644 --- a/src/Steeltoe.Management.EndpointOwinAutofac/Steeltoe.Management.EndpointOwinAutofac.csproj +++ b/src/Steeltoe.Management.EndpointOwinAutofac/Steeltoe.Management.EndpointOwinAutofac.csproj @@ -14,6 +14,8 @@ https://steeltoe.io https://www.apache.org/licenses/LICENSE-2.0 + + diff --git a/src/Steeltoe.Management.EndpointWeb/Steeltoe.Management.EndpointWeb.csproj b/src/Steeltoe.Management.EndpointWeb/Steeltoe.Management.EndpointWeb.csproj index 3ab03bc..cc4618b 100644 --- a/src/Steeltoe.Management.EndpointWeb/Steeltoe.Management.EndpointWeb.csproj +++ b/src/Steeltoe.Management.EndpointWeb/Steeltoe.Management.EndpointWeb.csproj @@ -1,6 +1,6 @@  - + Steeltoe Management Endpoints for ASP.NET 4.x Pivotal;dtillman @@ -17,7 +17,7 @@ false false - + bin\$(Configuration)\$(TargetFramework)\Steeltoe.Management.EndpointWeb.xml diff --git a/targetframework.props b/targetframework.props new file mode 100644 index 0000000..dff1c2a --- /dev/null +++ b/targetframework.props @@ -0,0 +1,10 @@ + + + $(NuGetPackageRoot)microsoft.targetingpack.netframework.v4.6.1/1.0.1/lib/net461/ + https://dotnet.myget.org/F/dotnet-core/api/v3/index.json + + + + + + diff --git a/test/Steeltoe.Management.CloudFoundryCore.Test/Steeltoe.Management.CloudFoundryCore.Test.csproj b/test/Steeltoe.Management.CloudFoundryCore.Test/Steeltoe.Management.CloudFoundryCore.Test.csproj index 6365321..7107df6 100644 --- a/test/Steeltoe.Management.CloudFoundryCore.Test/Steeltoe.Management.CloudFoundryCore.Test.csproj +++ b/test/Steeltoe.Management.CloudFoundryCore.Test/Steeltoe.Management.CloudFoundryCore.Test.csproj @@ -4,6 +4,8 @@ netcoreapp2.0;netcoreapp2.1;net461 + + diff --git a/test/Steeltoe.Management.EndpointBase.Test/Env/EnvEndpointTest.cs b/test/Steeltoe.Management.EndpointBase.Test/Env/EnvEndpointTest.cs index 403c2f4..4fe0bbd 100644 --- a/test/Steeltoe.Management.EndpointBase.Test/Env/EnvEndpointTest.cs +++ b/test/Steeltoe.Management.EndpointBase.Test/Env/EnvEndpointTest.cs @@ -55,7 +55,7 @@ public void GetPropertySourceName_ReturnsExpected() Assert.Equal(provider.GetType().Name, name); builder = new ConfigurationBuilder(); - builder.AddJsonFile("c:\\foobar", true); + builder.AddJsonFile("foobar", true); config = builder.Build(); ep = new EnvEndpoint(opts, config, new TestHosting()); diff --git a/test/Steeltoe.Management.EndpointBase.Test/Steeltoe.Management.EndpointBase.Test.csproj b/test/Steeltoe.Management.EndpointBase.Test/Steeltoe.Management.EndpointBase.Test.csproj index 2c3105b..5ac894a 100644 --- a/test/Steeltoe.Management.EndpointBase.Test/Steeltoe.Management.EndpointBase.Test.csproj +++ b/test/Steeltoe.Management.EndpointBase.Test/Steeltoe.Management.EndpointBase.Test.csproj @@ -12,7 +12,8 @@ http://steeltoe.io http://www.apache.org/licenses/LICENSE-2.0 - + + diff --git a/test/Steeltoe.Management.EndpointCore.Test/Steeltoe.Management.EndpointCore.Test.csproj b/test/Steeltoe.Management.EndpointCore.Test/Steeltoe.Management.EndpointCore.Test.csproj index d7ecf78..23d23e1 100644 --- a/test/Steeltoe.Management.EndpointCore.Test/Steeltoe.Management.EndpointCore.Test.csproj +++ b/test/Steeltoe.Management.EndpointCore.Test/Steeltoe.Management.EndpointCore.Test.csproj @@ -11,7 +11,8 @@ http://steeltoe.io http://www.apache.org/licenses/LICENSE-2.0 - + + diff --git a/test/Steeltoe.Management.EndpointOwin.Test/Steeltoe.Management.EndpointOwin.Test.csproj b/test/Steeltoe.Management.EndpointOwin.Test/Steeltoe.Management.EndpointOwin.Test.csproj index fffbe13..68ccadb 100644 --- a/test/Steeltoe.Management.EndpointOwin.Test/Steeltoe.Management.EndpointOwin.Test.csproj +++ b/test/Steeltoe.Management.EndpointOwin.Test/Steeltoe.Management.EndpointOwin.Test.csproj @@ -6,7 +6,9 @@ Unit test project for Steeltoe.Management.EndpointOwin net461 - + + + PreserveNewest diff --git a/test/Steeltoe.Management.EndpointOwinAutofac.Test/Steeltoe.Management.EndpointOwinAutofac.Test.csproj b/test/Steeltoe.Management.EndpointOwinAutofac.Test/Steeltoe.Management.EndpointOwinAutofac.Test.csproj index f564b9e..c60968e 100644 --- a/test/Steeltoe.Management.EndpointOwinAutofac.Test/Steeltoe.Management.EndpointOwinAutofac.Test.csproj +++ b/test/Steeltoe.Management.EndpointOwinAutofac.Test/Steeltoe.Management.EndpointOwinAutofac.Test.csproj @@ -7,6 +7,14 @@ net461 Steeltoe.Management.EndpointAutofac.Test + + + $(NuGetPackageRoot)microsoft.targetingpack.netframework.v4.6.1/1.0.1/lib/net461/ + https://dotnet.myget.org/F/dotnet-core/api/v3/index.json + + + + diff --git a/test/Steeltoe.Management.ExporterBase.Test/Steeltoe.Management.ExporterBase.Test.csproj b/test/Steeltoe.Management.ExporterBase.Test/Steeltoe.Management.ExporterBase.Test.csproj index d1d43e0..90d48d0 100644 --- a/test/Steeltoe.Management.ExporterBase.Test/Steeltoe.Management.ExporterBase.Test.csproj +++ b/test/Steeltoe.Management.ExporterBase.Test/Steeltoe.Management.ExporterBase.Test.csproj @@ -12,7 +12,8 @@ http://steeltoe.io http://www.apache.org/licenses/LICENSE-2.0 - + + diff --git a/test/Steeltoe.Management.ExporterCore.Test/Steeltoe.Management.ExporterCore.Test.csproj b/test/Steeltoe.Management.ExporterCore.Test/Steeltoe.Management.ExporterCore.Test.csproj index ddcaa1d..f150d56 100644 --- a/test/Steeltoe.Management.ExporterCore.Test/Steeltoe.Management.ExporterCore.Test.csproj +++ b/test/Steeltoe.Management.ExporterCore.Test/Steeltoe.Management.ExporterCore.Test.csproj @@ -12,7 +12,8 @@ http://steeltoe.io http://www.apache.org/licenses/LICENSE-2.0 - + + diff --git a/test/Steeltoe.Management.OpenCensus.Test/Steeltoe.Management.OpenCensus.Test.csproj b/test/Steeltoe.Management.OpenCensus.Test/Steeltoe.Management.OpenCensus.Test.csproj index fc598be..0b92cff 100644 --- a/test/Steeltoe.Management.OpenCensus.Test/Steeltoe.Management.OpenCensus.Test.csproj +++ b/test/Steeltoe.Management.OpenCensus.Test/Steeltoe.Management.OpenCensus.Test.csproj @@ -12,7 +12,8 @@ http://www.apache.org/licenses/LICENSE-2.0 Steeltoe.Management.Census - + + diff --git a/test/Steeltoe.Management.TracingBase.Test/Steeltoe.Management.TracingBase.Test.csproj b/test/Steeltoe.Management.TracingBase.Test/Steeltoe.Management.TracingBase.Test.csproj index f773062..95b7c95 100644 --- a/test/Steeltoe.Management.TracingBase.Test/Steeltoe.Management.TracingBase.Test.csproj +++ b/test/Steeltoe.Management.TracingBase.Test/Steeltoe.Management.TracingBase.Test.csproj @@ -12,8 +12,9 @@ http://steeltoe.io http://www.apache.org/licenses/LICENSE-2.0 - + + diff --git a/test/Steeltoe.Management.TracingCore.Test/Steeltoe.Management.TracingCore.Test.csproj b/test/Steeltoe.Management.TracingCore.Test/Steeltoe.Management.TracingCore.Test.csproj index a5e6697..fe5ed1f 100644 --- a/test/Steeltoe.Management.TracingCore.Test/Steeltoe.Management.TracingCore.Test.csproj +++ b/test/Steeltoe.Management.TracingCore.Test/Steeltoe.Management.TracingCore.Test.csproj @@ -12,8 +12,9 @@ http://steeltoe.io http://www.apache.org/licenses/LICENSE-2.0 - + +