Update CI workflow and project files for improved packaging and versi…

…oning (#62) * Update CI workflow and project files for improved packaging and versioning * Add step to restore Dotnet tools in CI workflow * Refactor CI workflow to streamline .NET tool restoration and versioning * Add NU5104 to NoWarn list in NugetPackage.Shared.props
microsoft · Jan 22, 2025 · 0b2f102 · 0b2f102
1 parent 4f30428
commit 0b2f102
Show file tree

Hide file tree

Showing 18 changed files with 29 additions and 60 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,13 +15,25 @@ jobs:
     - uses: actions/checkout@v4
       with:
         fetch-depth: 0
+
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
         dotnet-version: 8.0.x        
 
+    - uses: dotnet/nbgv@master
+      with:
+          setAllVars: true        
+    - run: echo "NuGetPackageVersion $NuGetPackageVersion"      
+
+    - name: Restore
+      run: dotnet restore AgentSdk.proj
+
     - name: Build
-      run: dotnet build
+      run: dotnet build --no-restore -c debug AgentSdk.proj
+
+    - name: Package
+      run: dotnet pack --no-build --no-restore -c debug src/Microsoft.Agents.SDK.sln 
 
     - name: Test
-      run: dotnet test ./src/
+      run: dotnet test --no-build --no-restore -c debug ./src/
diff --git a/src/NugetPackage.Shared.props b/src/NugetPackage.Shared.props
@@ -8,7 +8,7 @@
     <PackageProjectUrl Condition="'$(PackageProjectUrl)' == ''">https://github.com/microsoft/agents</PackageProjectUrl>
     <PackageLicenseUrl Condition="'$(PackageLicenseUrl)' == ''">https://github.com/microsoft/Agents-for-net?tab=MIT-1-ov-file#readme</PackageLicenseUrl>
     <RepositoryUrl Condition="'$(RepositoryUrl)' == ''">https://github.com/Microsoft/Agents-for-net</RepositoryUrl>
-    <NoWarn>$(NoWarn);NU1701;NU1900;NU5125</NoWarn>
+    <NoWarn>$(NoWarn);NU1701;NU1900;NU5125;NU5104</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/samples/Directory.Build.Props b/src/samples/Directory.Build.Props
@@ -0,0 +1,7 @@
+<Project>
+    <!-- See: https://docs.microsoft.com/en-us/visualstudio/msbuild/customize-your-build?view=vs-2019#directorybuildprops-and-directorybuildtargets -->
+    <PropertyGroup>
+        <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+        <IsPackable>false</IsPackable>
+    </PropertyGroup>
+</Project>
diff --git a/src/tests/BotBuilder.Testing/Microsoft.Agents.BotBuilder.Testing.csproj b/src/tests/BotBuilder.Testing/Microsoft.Agents.BotBuilder.Testing.csproj
@@ -7,10 +7,6 @@
   </PropertyGroup>
   <Import Project="..\..\Build.Common.core.props" />
 
-  <PropertyGroup>
-		<IsPackable>false</IsPackable>
-	</PropertyGroup>
-
   <PropertyGroup>
     <PackageId>Microsoft.Agents.BotBuilder.Testing</PackageId>
     <Description>Library for building bot tests using Microsoft Bot Framework Connector</Description>

diff --git a/src/tests/Directory.Build.Props b/src/tests/Directory.Build.Props
@@ -0,0 +1,6 @@
+<Project>
+    <!-- See: https://docs.microsoft.com/en-us/visualstudio/msbuild/customize-your-build?view=vs-2019#directorybuildprops-and-directorybuildtargets -->
+    <PropertyGroup>
+        <IsPackable>false</IsPackable>
+    </PropertyGroup>
+</Project>
diff --git a/src/tests/Microsoft.Agents.Auth.Tests/Microsoft.Agents.Auth.Tests.csproj b/src/tests/Microsoft.Agents.Auth.Tests/Microsoft.Agents.Auth.Tests.csproj
@@ -7,12 +7,6 @@
 	</PropertyGroup>
 	<Import Project="..\..\Build.Common.core.props" />
 
-
-	<PropertyGroup>
-		<!--    <TargetFramework>net8.0</TargetFramework> -->
-		<IsPackable>false</IsPackable>
-	</PropertyGroup>
-
 	<ItemGroup>
 		<PackageReference Include="Microsoft.NET.Test.Sdk" />
 		<PackageReference Include="xunit" />

diff --git a/...icrosoft.Agents.BotBuilder.Dialogs.Tests/Microsoft.Agents.BotBuilder.Dialogs.Tests.csproj b/...icrosoft.Agents.BotBuilder.Dialogs.Tests/Microsoft.Agents.BotBuilder.Dialogs.Tests.csproj
@@ -7,10 +7,6 @@
 	</PropertyGroup>
 	<Import Project="..\..\Build.Common.core.props" />
 
-	<PropertyGroup>
-		<IsPackable>false</IsPackable>
-	</PropertyGroup>
-
 	<ItemGroup>
 		<None Remove="test.settings.json" />
 	</ItemGroup>

diff --git a/...rosoft.Agents.BotBuilder.TestBot.Shared/Microsoft.Agents.BotBuilder.TestBot.Shared.csproj b/...rosoft.Agents.BotBuilder.TestBot.Shared/Microsoft.Agents.BotBuilder.TestBot.Shared.csproj
@@ -6,10 +6,6 @@
 		<SignAssembly>true</SignAssembly>
 	</PropertyGroup>
 	<Import Project="..\..\Build.Common.core.props" />
-
-  <PropertyGroup>
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
 
   <ItemGroup>
     <Content Remove="Cards\welcomeCard.json" />

diff --git a/...icrosoft.Agents.BotBuilder.TestBot.Tests/Microsoft.Agents.BotBuilder.TestBot.Tests.csproj b/...icrosoft.Agents.BotBuilder.TestBot.Tests/Microsoft.Agents.BotBuilder.TestBot.Tests.csproj
@@ -8,10 +8,6 @@
 	</PropertyGroup>
 	<Import Project="..\..\Build.Common.core.props" />
 
-  <PropertyGroup>
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
-
   <ItemGroup>
     <None Remove="appsettings.json" />
   </ItemGroup>

diff --git a/src/tests/Microsoft.Agents.BotBuilder.TestBot/Microsoft.Agents.BotBuilder.TestBot.csproj b/src/tests/Microsoft.Agents.BotBuilder.TestBot/Microsoft.Agents.BotBuilder.TestBot.csproj
@@ -11,10 +11,7 @@
 
   <Import Project="..\..\Build.Common.core.props" />
 
-  <PropertyGroup>
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
-
+
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" />
     <PackageReference Include="Microsoft.Recognizers.Text.DataTypes.TimexExpression" />

diff --git a/src/tests/Microsoft.Agents.BotBuilder.Tests/Microsoft.Agents.BotBuilder.Tests.csproj b/src/tests/Microsoft.Agents.BotBuilder.Tests/Microsoft.Agents.BotBuilder.Tests.csproj
@@ -6,10 +6,6 @@
 	</PropertyGroup>
 	<Import Project="..\..\Build.Common.core.props" />
 
-	<PropertyGroup>
-		<IsPackable>false</IsPackable>
-	</PropertyGroup>
-
 	<ItemGroup>
 		<Compile Remove="Properties\**" />
 		<EmbeddedResource Remove="Properties\**" />

diff --git a/src/tests/Microsoft.Agents.Client.Tests/Microsoft.Agents.Client.Tests.csproj b/src/tests/Microsoft.Agents.Client.Tests/Microsoft.Agents.Client.Tests.csproj
@@ -6,10 +6,6 @@
 	</PropertyGroup>
 	<Import Project="..\..\Build.Common.core.props" />
 
-	<PropertyGroup>
-		<IsPackable>false</IsPackable>
-	</PropertyGroup>
-
 	<ItemGroup>
 		<Compile Remove="Properties\**" />
 		<EmbeddedResource Remove="Properties\**" />

diff --git a/src/tests/Microsoft.Agents.Connector.Tests/Microsoft.Agents.Connector.Tests.csproj b/src/tests/Microsoft.Agents.Connector.Tests/Microsoft.Agents.Connector.Tests.csproj
@@ -8,10 +8,6 @@
 	</PropertyGroup>
 	<Import Project="..\..\Build.Common.core.props" />
 
-	<PropertyGroup>
-		<IsPackable>false</IsPackable>
-	</PropertyGroup>
-
 	<PropertyGroup>
 		<!--    <TargetFramework>net8.0</TargetFramework> -->
 		<IsPackable>false</IsPackable>

diff --git a/...soft.Agents.CopilotStudio.Client.Tests/Microsoft.Agents.CopilotStudio.Client.Tests.csproj b/...soft.Agents.CopilotStudio.Client.Tests/Microsoft.Agents.CopilotStudio.Client.Tests.csproj
@@ -7,10 +7,6 @@
 	</PropertyGroup>
 	<Import Project="..\..\Build.Common.core.props" />
 
-	<PropertyGroup>
-		<IsPackable>false</IsPackable>
-	</PropertyGroup>
-
 	<ItemGroup>
 		<Compile Remove="Properties\**" />
 		<EmbeddedResource Remove="Properties\**" />

diff --git a/src/tests/Microsoft.Agents.Model.Tests/Microsoft.Agents.Model.Tests.csproj b/src/tests/Microsoft.Agents.Model.Tests/Microsoft.Agents.Model.Tests.csproj
@@ -6,10 +6,6 @@
 	</PropertyGroup>
 	<Import Project="..\..\Build.Common.core.props" />
 
-	<PropertyGroup>
-		<IsPackable>false</IsPackable>
-	</PropertyGroup>
-
 	<ItemGroup>
 	  <Compile Remove="Properties\**" />
 	  <EmbeddedResource Remove="Properties\**" />

diff --git a/src/tests/Microsoft.Agents.State.Tests/Microsoft.Agents.State.Tests.csproj b/src/tests/Microsoft.Agents.State.Tests/Microsoft.Agents.State.Tests.csproj
@@ -6,9 +6,6 @@
 	</PropertyGroup>
 	<Import Project="..\..\Build.Common.core.props" />
 
-	<PropertyGroup>
-		<IsPackable>false</IsPackable>
-	</PropertyGroup>
 
 	<ItemGroup>
 	  <Compile Remove="Properties\**" />

diff --git a/src/tests/Microsoft.Agents.Storage.Tests/Microsoft.Agents.Storage.Tests.csproj b/src/tests/Microsoft.Agents.Storage.Tests/Microsoft.Agents.Storage.Tests.csproj
@@ -6,10 +6,6 @@
 	</PropertyGroup>
 	<Import Project="..\..\Build.Common.core.props" />
 
-	<PropertyGroup>
-		<IsPackable>false</IsPackable>
-	</PropertyGroup>
-
 	<ItemGroup>
 	  <Compile Remove="Properties\**" />
 	  <EmbeddedResource Remove="Properties\**" />

diff --git a/src/tests/Microsoft.Agents.Teams.Tests/Microsoft.Agents.Teams.Tests.csproj b/src/tests/Microsoft.Agents.Teams.Tests/Microsoft.Agents.Teams.Tests.csproj
@@ -6,10 +6,6 @@
 	</PropertyGroup>
 	<Import Project="..\..\Build.Common.core.props" />
 
-	<PropertyGroup>
-		<IsPackable>false</IsPackable>
-	</PropertyGroup>
-
 	<ItemGroup>
 	  <Compile Remove="Properties\**" />
 	  <EmbeddedResource Remove="Properties\**" />