Merge pull request #1 from Umplify/build-pipeline

Build pipeline
Umplify · Nov 10, 2022 · 0a9a335 · 0a9a335
2 parents f2084f8 + 0b74955
commit 0a9a335
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 24 deletions.
diff --git 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
@@ -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/....DependencyInjection.ExampleTests/Xunit.Microsoft.DependencyInjection.ExampleTests.csproj b/....DependencyInjection.ExampleTests/Xunit.Microsoft.DependencyInjection.ExampleTests.csproj
@@ -9,17 +9,17 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
 		<PackageReference Include="xunit" Version="2.4.2" />
 		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
 		<PackageReference Include="coverlet.collector" Version="3.2.0" />
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
-		<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
-		<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="6.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Options" Version="7.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="7.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/Abstracts/TestBedFixture.cs b/src/Abstracts/TestBedFixture.cs
@@ -58,7 +58,7 @@ private IConfigurationRoot GetConfigurationRoot(IEnumerable<TestAppSettings> 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
@@ -7,20 +7,20 @@
 	<PackageReadmeFile>README.md</PackageReadmeFile>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0"/>
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0"/>
-    <PackageReference Include="xunit.abstractions" Version="2.0.3"/>
-    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="6.0.0"/>
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0"/>
-    <PackageReference Include="xunit.core" Version="2.4.2"/>
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.1"/>
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
+    <PackageReference Include="xunit.abstractions" Version="2.0.3" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
+    <PackageReference Include="xunit.core" Version="2.4.2" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" />
   </ItemGroup>
   <ItemGroup>
-	<None Include="..\README.md" Pack="true" PackagePath="\"/>
+	<None Include="..\README.md" Pack="true" PackagePath="\" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Abstracts\"/>
-    <Folder Include="TestsOrder\"/>
-    <Folder Include="Attributes\"/>
+    <Folder Include="Abstracts\" />
+    <Folder Include="TestsOrder\" />
+    <Folder Include="Attributes\" />
   </ItemGroup>
 </Project>