start building 3.1.3, fix circular ref #820

SteeltoeOSS · Jan 19, 2022 · f1ba2c1 · f1ba2c1
1 parent 1492e83
commit f1ba2c1
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -17,7 +17,7 @@ jobs:
  variables:
  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
  DOTNET_CLI_TELEMETRY_OPTOUT: 1
- PackageVersion: $[format('3.1.2-{0}', variables['Build.BuildId'])]
+ PackageVersion: $[format('3.1.3-{0}', variables['Build.BuildId'])]
  BUILD_PACKAGES: true
  steps:
  - pwsh: |

diff --git a/src/Management/Management.sln b/src/Management/Management.sln
@@ -1,13 +1,14 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28729.10
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.32014.148
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B86A4082-6F42-4BFC-A1F2-83CC422AD493}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{8B4CE682-9C0B-4849-813B-E43BE098FCE2}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "config", "config", "{9764636B-4C42-4F38-8074-99C086B8FB74}"
  ProjectSection(SolutionItems) = preProject
+ ..\..\azure-pipelines.yml = ..\..\azure-pipelines.yml
  ..\..\nuget.config = ..\..\nuget.config
  ..\..\sharedproject.props = ..\..\sharedproject.props
  ..\..\sharedtest.props = ..\..\sharedtest.props

diff --git a/src/Management/src/EndpointCore/Env/EndpointServiceCollectionExtensions.cs b/src/Management/src/EndpointCore/Env/EndpointServiceCollectionExtensions.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information.
 
+using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
@@ -33,7 +34,7 @@ public static void AddEnvActuator(this IServiceCollection services, IConfigurati
 
  services.TryAddSingleton<IHostEnvironment>((provider) =>
  {
- var service = provider.GetRequiredService<IHostEnvironment>();
+ var service = provider.GetRequiredService<IWebHostEnvironment>();
  return new GenericHostingEnvironment()
  {
  EnvironmentName = service.EnvironmentName,

diff --git a/versions.props b/versions.props
@@ -1,6 +1,6 @@
 <Project>
  <PropertyGroup Condition="'$(TF_BUILD)' != 'true'">
- <VersionPrefix>3.1.2</VersionPrefix>
+ <VersionPrefix>3.1.3</VersionPrefix>
  </PropertyGroup>
  <PropertyGroup>
  <CoreFxVersion>4.4.0</CoreFxVersion>