diff --git a/azure-pipeline-PR.yml b/azure-pipeline-PR.yml index e4eb4dc..ac73368 100644 --- a/azure-pipeline-PR.yml +++ b/azure-pipeline-PR.yml @@ -14,10 +14,10 @@ pool: steps: - script: echo Build Number $(name) - task: UseDotNet@2 - displayName: 'Use .NET 6.0 sdk' + displayName: 'Use .NET 7.0 sdk' inputs: packageType: sdk - version: 6.0.402 + version: 7.0.100 installationPath: $(Agent.ToolsDirectory)/dotnet - script: echo Started restoring the source code - task: DotNetCoreCLI@2 diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 03d4f28..cad9b5c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,3 +1,8 @@ +variables: + Major: 7 + Minor: 0 + BuildConfiguration: Release + name: $(Major).$(Minor).$(rev:r) pr: none trigger: @@ -16,10 +21,10 @@ pool: steps: - script: echo Build Number $(name) - task: UseDotNet@2 - displayName: 'Use .NET 6.0 sdk' + displayName: 'Use .NET 7.0 sdk' inputs: packageType: sdk - version: 6.0.402 + version: 7.0.100 installationPath: $(Agent.ToolsDirectory)/dotnet - script: echo Started restoring the source code - task: DotNetCoreCLI@2 diff --git a/examples/Xunit.Microsoft.DependencyInjection.ExampleTests/Xunit.Microsoft.DependencyInjection.ExampleTests.csproj b/examples/Xunit.Microsoft.DependencyInjection.ExampleTests/Xunit.Microsoft.DependencyInjection.ExampleTests.csproj index 1a1a4b6..7761c2e 100644 --- a/examples/Xunit.Microsoft.DependencyInjection.ExampleTests/Xunit.Microsoft.DependencyInjection.ExampleTests.csproj +++ b/examples/Xunit.Microsoft.DependencyInjection.ExampleTests/Xunit.Microsoft.DependencyInjection.ExampleTests.csproj @@ -9,17 +9,17 @@ - + - - - - - - - + + + + + + + diff --git a/src/Abstracts/TestBedFixture.cs b/src/Abstracts/TestBedFixture.cs index 0da40ce..4677c86 100644 --- a/src/Abstracts/TestBedFixture.cs +++ b/src/Abstracts/TestBedFixture.cs @@ -58,7 +58,7 @@ private IConfigurationRoot GetConfigurationRoot(IEnumerable con { foreach (var configurationFile in configurationFiles) { - ConfigurationBuilder.AddJsonFile(configurationFile.Filename, optional: configurationFile.IsOptional); + ConfigurationBuilder.AddJsonFile(configurationFile.Filename!, optional: configurationFile.IsOptional); } ConfigurationBuilder.AddEnvironmentVariables(); return ConfigurationBuilder.Build(); diff --git a/src/Xunit.Microsoft.DependencyInjection.csproj b/src/Xunit.Microsoft.DependencyInjection.csproj index be50cc4..50579a8 100644 --- a/src/Xunit.Microsoft.DependencyInjection.csproj +++ b/src/Xunit.Microsoft.DependencyInjection.csproj @@ -7,20 +7,20 @@ README.md - - - - - - - + + + + + + + - + - - - + + + \ No newline at end of file