Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update CI workflow and project files for improved packaging and versioning #62

Merged
merged 4 commits into from
Jan 22, 2025
Merged

Update CI workflow and project files for improved packaging and versioning #62

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5332841
Update CI workflow and project files for improved packaging and versi…
MattB-msft Jan 21, 2025
daf5307
Add step to restore Dotnet tools in CI workflow
MattB-msft Jan 21, 2025
7515686
Refactor CI workflow to streamline .NET tool restoration and versioning
MattB-msft Jan 22, 2025
a43fad2
Add NU5104 to NoWarn list in NugetPackage.Shared.props
MattB-msft Jan 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,21 @@ jobs:
with:
dotnet-version: 8.0.x

- name: GetVersionInfo
shell: pwsh
run: |
cd src/libraries
$nbgv_version=(dotnet nbgv get-version -v NuGetPackageVersion -f text)
Write-Host "Version:" $nbgv_version

- 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/
7 changes: 7 additions & 0 deletions src/samples/Directory.Build.Props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
4 changes: 0 additions & 4 deletions src/tests/BotBuilder.Testing/Microsoft.Agents.BotBuilder.Testing.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 6 additions & 0 deletions src/tests/Directory.Build.Props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
6 changes: 0 additions & 6 deletions src/tests/Microsoft.Agents.Auth.Tests/Microsoft.Agents.Auth.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
4 changes: 0 additions & 4 deletions ...icrosoft.Agents.BotBuilder.Dialogs.Tests/Microsoft.Agents.BotBuilder.Dialogs.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@
</PropertyGroup>
<Import Project="..\..\Build.Common.core.props" />

<PropertyGroup>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<None Remove="test.settings.json" />
</ItemGroup>
Expand Down
4 changes: 0 additions & 4 deletions ...rosoft.Agents.BotBuilder.TestBot.Shared/Microsoft.Agents.BotBuilder.TestBot.Shared.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
4 changes: 0 additions & 4 deletions ...icrosoft.Agents.BotBuilder.TestBot.Tests/Microsoft.Agents.BotBuilder.TestBot.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@
</PropertyGroup>
<Import Project="..\..\Build.Common.core.props" />

<PropertyGroup>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<None Remove="appsettings.json" />
</ItemGroup>
Expand Down
5 changes: 1 addition & 4 deletions src/tests/Microsoft.Agents.BotBuilder.TestBot/Microsoft.Agents.BotBuilder.TestBot.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
4 changes: 0 additions & 4 deletions src/tests/Microsoft.Agents.BotBuilder.Tests/Microsoft.Agents.BotBuilder.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
</PropertyGroup>
<Import Project="..\..\Build.Common.core.props" />

<PropertyGroup>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<Compile Remove="Properties\**" />
<EmbeddedResource Remove="Properties\**" />
Expand Down
4 changes: 0 additions & 4 deletions src/tests/Microsoft.Agents.Client.Tests/Microsoft.Agents.Client.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
</PropertyGroup>
<Import Project="..\..\Build.Common.core.props" />

<PropertyGroup>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<Compile Remove="Properties\**" />
<EmbeddedResource Remove="Properties\**" />
Expand Down
4 changes: 0 additions & 4 deletions src/tests/Microsoft.Agents.Connector.Tests/Microsoft.Agents.Connector.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@
</PropertyGroup>
<Import Project="..\..\Build.Common.core.props" />

<PropertyGroup>
<IsPackable>false</IsPackable>
</PropertyGroup>

<PropertyGroup>
<!-- <TargetFramework>net8.0</TargetFramework> -->
<IsPackable>false</IsPackable>
Expand Down
4 changes: 0 additions & 4 deletions ...soft.Agents.CopilotStudio.Client.Tests/Microsoft.Agents.CopilotStudio.Client.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@
</PropertyGroup>
<Import Project="..\..\Build.Common.core.props" />

<PropertyGroup>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<Compile Remove="Properties\**" />
<EmbeddedResource Remove="Properties\**" />
Expand Down
4 changes: 0 additions & 4 deletions src/tests/Microsoft.Agents.Model.Tests/Microsoft.Agents.Model.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
</PropertyGroup>
<Import Project="..\..\Build.Common.core.props" />

<PropertyGroup>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<Compile Remove="Properties\**" />
<EmbeddedResource Remove="Properties\**" />
Expand Down
3 changes: 0 additions & 3 deletions src/tests/Microsoft.Agents.State.Tests/Microsoft.Agents.State.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
</PropertyGroup>
<Import Project="..\..\Build.Common.core.props" />

<PropertyGroup>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<Compile Remove="Properties\**" />
Expand Down
4 changes: 0 additions & 4 deletions src/tests/Microsoft.Agents.Storage.Tests/Microsoft.Agents.Storage.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
</PropertyGroup>
<Import Project="..\..\Build.Common.core.props" />

<PropertyGroup>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<Compile Remove="Properties\**" />
<EmbeddedResource Remove="Properties\**" />
Expand Down
4 changes: 0 additions & 4 deletions src/tests/Microsoft.Agents.Teams.Tests/Microsoft.Agents.Teams.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
</PropertyGroup>
<Import Project="..\..\Build.Common.core.props" />

<PropertyGroup>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<Compile Remove="Properties\**" />
<EmbeddedResource Remove="Properties\**" />
Expand Down
Loading