diff --git a/eng/pipelines/templates/BuildAndTest.yml b/eng/pipelines/templates/BuildAndTest.yml index e3814264015..81a9ee5d2a4 100644 --- a/eng/pipelines/templates/BuildAndTest.yml +++ b/eng/pipelines/templates/BuildAndTest.yml @@ -48,12 +48,13 @@ steps: -configuration ${{ parameters.buildConfig }} -warnAsError ${{ parameters.warnAsError }} /bl:${{ parameters.repoLogPath }}/build.binlog + /p:EnableEvaluationReportBuild=true $(_OfficialBuildIdArgs) displayName: Build - ${{ if eq(parameters.isWindows, 'true') }}: - pwsh: | - $(Build.SourcesDirectory)/src/Libraries/Microsoft.Extensions.AI.Evaluation.Reporting/TypeScript/azure-devops-report/build.ps1 -OutputPath $(Build.ArtifactStagingDirectory)\VSIX + $(Build.SourcesDirectory)/src/Libraries/Microsoft.Extensions.AI.Evaluation.Reporting/TypeScript/azure-devops-report/build.ps1 -OutputPath $(Build.Arcade.ArtifactsPath)/packages displayName: Build Azure DevOps plugin - ${{ if ne(parameters.skipTests, 'true') }}: diff --git a/src/Libraries/Microsoft.Extensions.AI.Evaluation.Console/Directory.Build.targets b/src/Libraries/Microsoft.Extensions.AI.Evaluation.Console/Directory.Build.targets new file mode 100644 index 00000000000..a13c91dd24a --- /dev/null +++ b/src/Libraries/Microsoft.Extensions.AI.Evaluation.Console/Directory.Build.targets @@ -0,0 +1,33 @@ + + + + + + + <_ConstantsFilePath>$(IntermediateOutputPath)Constants.g.cs + <_Lines> +// +// This file is auto-generated by MSBuild. +// + +namespace $(RootNamespace)%3B + +internal static class Constants +{ + public const string Version = "$(Version)"%3B +} + + + + + + + + + + + + diff --git a/src/Libraries/Microsoft.Extensions.AI.Evaluation.Console/Microsoft.Extensions.AI.Evaluation.Console.csproj b/src/Libraries/Microsoft.Extensions.AI.Evaluation.Console/Microsoft.Extensions.AI.Evaluation.Console.csproj index 209d13226ac..d5775d4aa9c 100644 --- a/src/Libraries/Microsoft.Extensions.AI.Evaluation.Console/Microsoft.Extensions.AI.Evaluation.Console.csproj +++ b/src/Libraries/Microsoft.Extensions.AI.Evaluation.Console/Microsoft.Extensions.AI.Evaluation.Console.csproj @@ -33,34 +33,4 @@ - - - - - $(IntermediateOutputPath)Constants.g.cs - -// -// This file is auto-generated by MSBuild. -// - -namespace Microsoft.Extensions.AI.Evaluation.Console%3B - -internal static class Constants -{ - public const string Version = "$(Version)"%3B -} - - - - - - - - - - - diff --git a/src/Libraries/Microsoft.Extensions.AI.Evaluation.Reporting/CSharp/Microsoft.Extensions.AI.Evaluation.Reporting.csproj b/src/Libraries/Microsoft.Extensions.AI.Evaluation.Reporting/CSharp/Microsoft.Extensions.AI.Evaluation.Reporting.csproj index 467c910b6d8..5e41328d921 100644 --- a/src/Libraries/Microsoft.Extensions.AI.Evaluation.Reporting/CSharp/Microsoft.Extensions.AI.Evaluation.Reporting.csproj +++ b/src/Libraries/Microsoft.Extensions.AI.Evaluation.Reporting/CSharp/Microsoft.Extensions.AI.Evaluation.Reporting.csproj @@ -1,5 +1,12 @@  + + A library for aggregating and reporting evaluation data. This library also includes support for caching LLM responses. $(TargetFrameworks);netstandard2.0 @@ -23,7 +30,8 @@ - + Reporting.HTML.index.html @@ -33,59 +41,4 @@ - - - - - - - - - - - $(IntermediateOutputPath)Constants.g.cs - -// -// This file is auto-generated by MSBuild. -// - -namespace Microsoft.Extensions.AI.Evaluation.Reporting%3B - -internal static class Constants -{ - public const string Version = "$(Version)"%3B -} - - - - - - - - - - - - - - - - ..\TypeScript\azure-devops-report\VSIXPackageVersion.json - $(VersionPrefix).42424242 - $(VersionPrefix).$(VersionSuffixDateStamp)$(VersionSuffixBuildOfTheDayPadded) - {"PackageVersion":"$(VSIXVersion)"} - - - - diff --git a/src/Libraries/Microsoft.Extensions.AI.Evaluation.Reporting/Directory.Build.targets b/src/Libraries/Microsoft.Extensions.AI.Evaluation.Reporting/Directory.Build.targets new file mode 100644 index 00000000000..f712788c23c --- /dev/null +++ b/src/Libraries/Microsoft.Extensions.AI.Evaluation.Reporting/Directory.Build.targets @@ -0,0 +1,76 @@ + + + + + <_TypescriptRootPath>$(MSBuildThisFileDirectory)/TypeScript + <_NpmInstallStampFile>$(_TypescriptRootPath)/node_modules/.installed + + + + + + + + + + + + + + + + + <_ConstantsFilePath>$(IntermediateOutputPath)Constants.g.cs + <_Lines> +// +// This file is auto-generated by MSBuild. +// + +namespace $(RootNamespace)%3B + +internal static class Constants +{ + public const string Version = "$(Version)"%3B +} + + + + + + + + + + + + + + + + <_VSIXPackageVersionFile>$(MSBuildThisFileDirectory)\TypeScript\azure-devops-report\VSIXPackageVersion.json + + <_VSIXVersion>$(VersionPrefix).42424242 + <_VSIXVersion Condition=" '$(VersionSuffixDateStamp)'!='' ">$(VersionPrefix).$(VersionSuffixDateStamp)$(VersionSuffixBuildOfTheDayPadded) + + <_Lines>{"PackageVersion":"$(_VSIXVersion)"} + + + + +