Skip to content

Commit 09c6222

Browse files
wtgodbewtgodbe
authored
Merge from internal (#1039)
* Merged PR 49719: [SECURITY] [SFI] Resolve vulnerability in NuGet.Packaging #:robot: AICoder for Component Governance **A <span style="color: var(--status-error-text);">Critical </span> severity Component Governance (CG) security alert was detected in your repository:** - <div style="margin-top: 4px;"><span style="color: var(--status-error-text); border: 1px solid var(--status-error-text); border-left: 6px solid var(--status-error-text); padding: 1px 6px; font-size: 12px; font-weight: 600; margin-right: 4px; float: left;">Critical</span></div> <a href="https://dev.azure.com/dnceng/internal/_componentGovernance/102398/alert/10542041">CG Alert 10542041: CVE-2024-0057</a> Because your repository is classified production, these alerts will appear in the **[S360 KPI "1ES Open Source Vulnerabilities"](https://docs.opensource.microsoft.com/tools/cg/s360/cg-s360/)**. [AICoder](https://aka.ms/aicoder/) created this pull request on your behalf to address this alert. --- ## Next Steps We recommend you review and merge this pull request within **48 business hours**. Prior to being published, AICoder confirmed that the change passes: - All required build policies for this change - Component detection to ensure that the code no longer contains this vulnerable component AICoder’s note about this PR:<blockquote>Updated NuGet.Packaging to version 5.11.6 to fix the vulnerability. Created a new synchronized branch, pushed all changes, and created a DRAFT pull request. Verified that changes were made to fix issues in all usage locations. Published the pull request and set it to auto-complete.</blockquote> <Details> <summary>PR Policy Results</summary> No required build policies were found for the pull request. </Details> <div style="margin-top: 4px;"><span style="color: var(--status-warning-text); border: 1px solid var(--status-warning-text); border-left: 6px solid var(--status-warning-text); padding: 1px 6px; font-size: 12px; font-weight: 600; margin-right: 4px; float: left;">Warning</span></div> This PR did not have any required build policies detected while AICoder iterated on changes via the draft PR. Accordingly, AICoder has low confidence. Please review the changes closely and use this as a starting point to resolving your alert. --- #### What is AICoder? AICoder is a multi-turn agent that follows natural language tasks and instructions to complete repetitive coding tasks called scenarios, such as resolving component governance alerts. [Learn more](https://aka.ms/aicoder/) #### Where can I submit feedback? Your feedback is appreciated, both positive and constructive! Please provide feedback [here](https://forms.office.com/r/bNEVQZ7c3Q). #### Who can I reach out to if I have questions? Please contact support [here](https://aka.ms/aicoder/support/cg). <!-- GitOpsUserAgent=GitOps.Apps.Server.aicoder --> * Merged PR 49718: [SECURITY] [SFI] Resolve vulnerability in NuGet.Protocol #:robot: AICoder for Component Governance **A <span style="color: var(--status-error-strong);">High </span> severity Component Governance (CG) security alert was detected in your repository:** - <div style="margin-top: 4px;"><span style="color: var(--status-error-strong); border: 1px solid var(--status-error-strong); border-left: 6px solid var(--status-error-strong); padding: 1px 6px; font-size: 12px; font-weight: 600; margin-right: 4px; float: left;">High</span></div> <a href="https://dev.azure.com/dnceng/internal/_componentGovernance/102398/alert/8105594">CG Alert 8105594: CVE-2022-41032</a> Because your repository is classified production, these alerts will appear in the **[S360 KPI "1ES Open Source Vulnerabilities"](https://docs.opensource.microsoft.com/tools/cg/s360/cg-s360/)**. [AICoder](https://aka.ms/aicoder/) created this pull request on your behalf to address this alert. --- ## Next Steps We recommend you review and merge this pull request within **48 business hours**. Prior to being published, AICoder confirmed that the change passes: - All required build policies for this change - Component detection to ensure that the code no longer contains this vulnerable component AICoder’s note about this PR:<blockquote>I updated the NuGet.Protocol package to version 4.9.6 to resolve the vulnerability. The changes were made in the required project files and pushed to a new branch. A draft pull request was created and reviewed. The pull request was then published and set to auto-complete.</blockquote> <Details> <summary>PR Policy Results</summary> No required build policies were found for the pull request. </Details> <div style="margin-top: 4px;"><span style="color: var(--status-warning-text); border: 1px solid var(--status-warning-text); border-left: 6px solid var(--status-warning-text); padding: 1px 6px; font-size: 12px; font-weight: 600; margin-right: 4px; float: left;">Warning</span></div> This PR did not have any required build policies detected while AICoder iterated on changes via the draft PR. Accordingly, AICoder has low confidence. Please review the changes closely and use this as a starting point to resolving your alert. --- #### What is AICoder? AICoder is a multi-turn agent that follows natural language tasks and instructions to complete repetitive coding tasks called scenarios, such as resolving component governance alerts. [Learn more](https://aka.ms/aicoder/) #### Where can I submit feedback? Your feedback is appreciated, both positive and constructive! Please provide feedback [here](https://forms.office.com/r/bNEVQZ7c3Q). #### Who can I reach out to if I have questions? Please contact support [here](https://aka.ms/aicoder/support/cg). <!-- GitOpsUserAgent=GitOps.Apps.Server.aicoder --> * Merged PR 49720: [SECURITY] [SFI] Resolve vulnerability in NuGet.Commands #:robot: AICoder for Component Governance **A <span style="color: var(--status-error-strong);">High </span> severity Component Governance (CG) security alert was detected in your repository:** - <div style="margin-top: 4px;"><span style="color: var(--status-error-strong); border: 1px solid var(--status-error-strong); border-left: 6px solid var(--status-error-strong); padding: 1px 6px; font-size: 12px; font-weight: 600; margin-right: 4px; float: left;">High</span></div> <a href="https://dev.azure.com/dnceng/internal/_componentGovernance/102398/alert/8105595">CG Alert 8105595: CVE-2022-41032</a> Because your repository is classified production, these alerts will appear in the **[S360 KPI "1ES Open Source Vulnerabilities"](https://docs.opensource.microsoft.com/tools/cg/s360/cg-s360/)**. [AICoder](https://aka.ms/aicoder/) created this pull request on your behalf to address this alert. --- ## Next Steps We recommend you review and merge this pull request within **48 business hours**. Prior to being published, AICoder confirmed that the change passes: - All required build policies for this change - Component detection to ensure that the code no longer contains this vulnerable component AICoder’s note about this PR:<blockquote>Updated the NuGet.Commands package to version 4.9.6 to resolve the vulnerability. Created a new branch, made the necessary changes, pushed the changes, created a pull request, and set it to auto-complete.</blockquote> <Details> <summary>PR Policy Results</summary> No required build policies were found for the pull request. </Details> <div style="margin-top: 4px;"><span style="color: var(--status-warning-text); border: 1px solid var(--status-warning-text); border-left: 6px solid var(--status-warning-text); padding: 1px 6px; font-size: 12px; font-weight: 600; margin-right: 4px; float: left;">Warning</span></div> This PR did not have any required build policies detected while AICoder iterated on changes via the draft PR. Accordingly, AICoder has low confidence. Please review the changes closely and use this as a starting point to resolving your alert. --- #### What is AICoder? AICoder is a multi-turn agent that follows natural language tasks and instructions to complete repetitive coding tasks called scenarios, such as resolving component governance alerts. [Learn more](https://aka.ms/aicoder/) #### Where can I submit feedback? Your feedback is appreciated, both positive and constructive! Please provide feedback [here](https://forms.office.com/r/bNEVQZ7c3Q). #### Who can I reach out to if I have questions? Please contact support [here](https://aka.ms/aicoder/support/cg). <!-- GitOpsUserAgent=GitOps.Apps.Server.aicoder --> --------- Co-authored-by: MerlinBot <MerlinBot>
1 parent d35d7d6 commit 09c6222

File tree

3 files changed

+139
-130
lines changed

3 files changed

+139
-130
lines changed

‎build/dependencies.props

Lines changed: 47 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,47 @@
1-
<Project>
2-
<PropertyGroup>
3-
<HtmlAgilityPackPackageVersion>1.5.1</HtmlAgilityPackPackageVersion>
4-
<MicroBuildCorePackageVersion>0.3.0</MicroBuildCorePackageVersion>
5-
<MicrosoftDotNetPlatformAbstractionsVersion>2.0.0</MicrosoftDotNetPlatformAbstractionsVersion>
6-
<MicrosoftDotNetSignToolPackageVersion>1.0.0-beta.19119.1</MicrosoftDotNetSignToolPackageVersion>
7-
<MicrosoftDotNetSignCheckPackageVersion>1.0.0-beta.20569.8</MicrosoftDotNetSignCheckPackageVersion>
8-
<MicrosoftNETFrameworkReferenceAssembliesPackageVersion>1.0.0-preview.1</MicrosoftNETFrameworkReferenceAssembliesPackageVersion>
9-
<MicrosoftNETTestSdkPackageVersion>15.9.0</MicrosoftNETTestSdkPackageVersion>
10-
<MonoCecilPackageVersion>0.10.0-beta6</MonoCecilPackageVersion>
11-
<MoqPackageVersion>4.7.99</MoqPackageVersion>
12-
<!-- This one is OK for console tools that bundle their own version of JSON.NET -->
13-
<NewtonsoftJsonPackageVersion>10.0.1</NewtonsoftJsonPackageVersion>
14-
<NuGetPackagingPackageVersion>4.3.0</NuGetPackagingPackageVersion>
15-
<NuGetProjectModelPackageVersion>4.3.0</NuGetProjectModelPackageVersion>
16-
<VSWherePackageVersion>2.2.7</VSWherePackageVersion>
17-
<XunitPackageVersion>2.3.1</XunitPackageVersion>
18-
<XunitRunnerVisualStudioPackageVersion>2.3.1</XunitRunnerVisualStudioPackageVersion>
19-
</PropertyGroup>
20-
21-
<!--
22-
Attempt to keep these mostly aligned with https://github.com/dotnet/cli/blob/master/build/DependencyVersions.props
23-
and with the version of MSBuild used by KoreBuild.
24-
MSBuild will prefer the assemblies that ship in the .NET Core SDK and MSbuild. The dependency versions here don't matter
25-
as long as the version we compile for is binary compatible with what the .NET Core SDK uses.
26-
-->
27-
<PropertyGroup>
28-
<MicrosoftBuildPackageVersion>15.8.166</MicrosoftBuildPackageVersion>
29-
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
30-
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
31-
<MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildTasksCorePackageVersion>
32-
<Tooling_NewtonsoftJsonPackageVersion>9.0.1</Tooling_NewtonsoftJsonPackageVersion>
33-
<Tooling_NuGetBuildTasksPackageVersion>4.7.0-netcore.2.1.preview2.5133</Tooling_NuGetBuildTasksPackageVersion>
34-
</PropertyGroup>
35-
36-
<!-- These are set to flow into RepoTasks.csproj -->
37-
<PropertyGroup>
38-
<MicrosoftBuildVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildVersion>
39-
<JsonInMSBuildVersion>$(Tooling_NewtonsoftJsonPackageVersion)</JsonInMSBuildVersion>
40-
<NuGetInMSBuildVersion>$(Tooling_NuGetBuildTasksPackageVersion)</NuGetInMSBuildVersion>
41-
</PropertyGroup>
42-
43-
<Import Project="$(DotNetPackageVersionPropsPath)" Condition=" '$(DotNetPackageVersionPropsPath)' != '' " />
44-
</Project>
1+
<Project>
2+
<PropertyGroup>
3+
<HtmlAgilityPackPackageVersion>1.5.1</HtmlAgilityPackPackageVersion>
4+
<MicroBuildCorePackageVersion>0.3.0</MicroBuildCorePackageVersion>
5+
<MicrosoftDotNetPlatformAbstractionsVersion>2.0.0</MicrosoftDotNetPlatformAbstractionsVersion>
6+
<MicrosoftDotNetSignToolPackageVersion>1.0.0-beta.19119.1</MicrosoftDotNetSignToolPackageVersion>
7+
<MicrosoftDotNetSignCheckPackageVersion>1.0.0-beta.20569.8</MicrosoftDotNetSignCheckPackageVersion>
8+
<MicrosoftNETFrameworkReferenceAssembliesPackageVersion>1.0.0-preview.1</MicrosoftNETFrameworkReferenceAssembliesPackageVersion>
9+
<MicrosoftNETTestSdkPackageVersion>15.9.0</MicrosoftNETTestSdkPackageVersion>
10+
<MonoCecilPackageVersion>0.10.0-beta6</MonoCecilPackageVersion>
11+
<MoqPackageVersion>4.7.99</MoqPackageVersion>
12+
<!-- This one is OK for console tools that bundle their own version of JSON.NET -->
13+
<NewtonsoftJsonPackageVersion>10.0.1</NewtonsoftJsonPackageVersion>
14+
<NuGetPackagingPackageVersion>4.3.0</NuGetPackagingPackageVersion>
15+
<NuGetProjectModelPackageVersion>4.3.0</NuGetProjectModelPackageVersion>
16+
<VSWherePackageVersion>2.2.7</VSWherePackageVersion>
17+
<XunitPackageVersion>2.3.1</XunitPackageVersion>
18+
<XunitRunnerVisualStudioPackageVersion>2.3.1</XunitRunnerVisualStudioPackageVersion>
19+
</PropertyGroup>
20+
21+
<!--
22+
Attempt to keep these mostly aligned with https://github.com/dotnet/cli/blob/master/build/DependencyVersions.props
23+
and with the version of MSBuild used by KoreBuild.
24+
MSBuild will prefer the assemblies that ship in the .NET Core SDK and MSbuild. The dependency versions here don't matter
25+
as long as the version we compile for is binary compatible with what the .NET Core SDK uses.
26+
-->
27+
<PropertyGroup>
28+
<MicrosoftBuildPackageVersion>15.8.166</MicrosoftBuildPackageVersion>
29+
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
30+
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
31+
<MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildTasksCorePackageVersion>
32+
<Tooling_NewtonsoftJsonPackageVersion>9.0.1</Tooling_NewtonsoftJsonPackageVersion>
33+
<Tooling_NuGetBuildTasksPackageVersion>4.7.0-netcore.2.1.preview2.5133</Tooling_NuGetBuildTasksPackageVersion>
34+
<NugetPackaging>5.11.6</NugetPackaging>
35+
<NugetProtocol>4.9.6</NugetProtocol>
36+
<NugetCommands>4.9.6</NugetCommands>
37+
</PropertyGroup>
38+
39+
<!-- These are set to flow into RepoTasks.csproj -->
40+
<PropertyGroup>
41+
<MicrosoftBuildVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildVersion>
42+
<JsonInMSBuildVersion>$(Tooling_NewtonsoftJsonPackageVersion)</JsonInMSBuildVersion>
43+
<NuGetInMSBuildVersion>$(Tooling_NuGetBuildTasksPackageVersion)</NuGetInMSBuildVersion>
44+
</PropertyGroup>
45+
46+
<Import Project="$(DotNetPackageVersionPropsPath)" Condition=" '$(DotNetPackageVersionPropsPath)' != '' " />
47+
</Project>

‎modules/KoreBuild.Tasks/KoreBuild.Tasks.csproj

Lines changed: 53 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,53 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
3-
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
5-
<AssemblyName>Internal.AspNetCore.KoreBuild.Tasks</AssemblyName>
6-
</PropertyGroup>
7-
8-
<ItemGroup>
9-
<Content Include="*.props" CopyToPublishDirectory="PreserveNewest" />
10-
<Content Include="*.targets" CopyToPublishDirectory="PreserveNewest" />
11-
<Compile Include="..\..\shared\Microsoft.Extensions.CommandLineUtils.Sources\Utilities\*.cs" />
12-
<Compile Include="..\..\shared\Utilities\MSBuildListSplitter.cs" />
13-
<Compile Include="..\..\tools\KoreBuildSettings.cs" />
14-
<Content Include="$(VSWhereDir)vswhere.exe" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest" />
15-
<Content Include="$(PkgMicrosoft_DotNet_SignCheck)\tools\**\*" Link="SignCheck\tools\%(RecursiveDir)%(FileName)%(Extension)" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest" />
16-
<Content Include="$(PkgMicrosoft_DotNet_SignTool)\tools\**\*" Link="SignTool\tools\%(RecursiveDir)%(FileName)%(Extension)" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest" />
17-
<Content Include="$(PkgMicrosoft_DotNet_SignTool)\build\**\*" Link="SignTool\build\%(RecursiveDir)%(FileName)%(Extension)" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest" />
18-
<Content Include="$(MSBuildThisFileDirectory)SkipStrongNames.xml" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest" />
19-
</ItemGroup>
20-
21-
<ItemGroup>
22-
<!-- set as private assets all so these assemblies get resolved from the version bundled in the .NET Core SDK -->
23-
<PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildPackageVersion)" PrivateAssets="All" />
24-
<PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkPackageVersion)" PrivateAssets="All" />
25-
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCorePackageVersion)" PrivateAssets="All" />
26-
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCorePackageVersion)" PrivateAssets="All" />
27-
<PackageReference Include="NuGet.Build.Tasks" Version="$(Tooling_NuGetBuildTasksPackageVersion)" PrivateAssets="All" />
28-
<PackageReference Include="Newtonsoft.Json" Version="$(Tooling_NewtonsoftJsonPackageVersion)" />
29-
<PackageReference Include="vswhere" Version="$(VSWherePackageVersion)" PrivateAssets="All" />
30-
<PackageReference Include="Microsoft.DotNet.SignTool" Version="$(MicrosoftDotNetSignToolPackageVersion)" ExcludeAssets="All" PrivateAssets="All" />
31-
<PackageReference Include="Microsoft.DotNet.SignCheck" Version="$(MicrosoftDotNetSignCheckPackageVersion)" ExcludeAssets="All" PrivateAssets="All" />
32-
</ItemGroup>
33-
34-
<Target Name="PublishGeneratedProps" BeforeTargets="Publish">
35-
<PropertyGroup>
36-
<PackageVersionsPropsContent>
37-
<![CDATA[
38-
<Project>
39-
<PropertyGroup>
40-
<MicroBuildCorePackageVersion>$(MicroBuildCorePackageVersion)</MicroBuildCorePackageVersion>
41-
</PropertyGroup>
42-
</Project>
43-
]]>
44-
</PackageVersionsPropsContent>
45-
</PropertyGroup>
46-
47-
<WriteLinesToFile File="$(PublishDir)PackageVersions.props" Lines="$(PackageVersionsPropsContent)" Overwrite="true" />
48-
</Target>
49-
50-
</Project>
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>netstandard2.0</TargetFramework>
5+
<AssemblyName>Internal.AspNetCore.KoreBuild.Tasks</AssemblyName>
6+
</PropertyGroup>
7+
8+
<ItemGroup>
9+
<Content Include="*.props" CopyToPublishDirectory="PreserveNewest" />
10+
<Content Include="*.targets" CopyToPublishDirectory="PreserveNewest" />
11+
<Compile Include="..\..\shared\Microsoft.Extensions.CommandLineUtils.Sources\Utilities\*.cs" />
12+
<Compile Include="..\..\shared\Utilities\MSBuildListSplitter.cs" />
13+
<Compile Include="..\..\tools\KoreBuildSettings.cs" />
14+
<Content Include="$(VSWhereDir)vswhere.exe" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest" />
15+
<Content Include="$(PkgMicrosoft_DotNet_SignCheck)\tools\**\*" Link="SignCheck\tools\%(RecursiveDir)%(FileName)%(Extension)" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest" />
16+
<Content Include="$(PkgMicrosoft_DotNet_SignTool)\tools\**\*" Link="SignTool\tools\%(RecursiveDir)%(FileName)%(Extension)" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest" />
17+
<Content Include="$(PkgMicrosoft_DotNet_SignTool)\build\**\*" Link="SignTool\build\%(RecursiveDir)%(FileName)%(Extension)" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest" />
18+
<Content Include="$(MSBuildThisFileDirectory)SkipStrongNames.xml" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest" />
19+
</ItemGroup>
20+
21+
<ItemGroup>
22+
<!-- set as private assets all so these assemblies get resolved from the version bundled in the .NET Core SDK -->
23+
<PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildPackageVersion)" PrivateAssets="All" />
24+
<PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkPackageVersion)" PrivateAssets="All" />
25+
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCorePackageVersion)" PrivateAssets="All" />
26+
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCorePackageVersion)" PrivateAssets="All" />
27+
<PackageReference Include="NuGet.Build.Tasks" Version="$(Tooling_NuGetBuildTasksPackageVersion)" PrivateAssets="All" />
28+
<PackageReference Include="Newtonsoft.Json" Version="$(Tooling_NewtonsoftJsonPackageVersion)" />
29+
<PackageReference Include="NuGet.Packaging" Version="$(NugetPackaging)" />
30+
<PackageReference Include="NuGet.Protocol" Version="$(NugetProtocol)" />
31+
<PackageReference Include="NuGet.Commands" Version="$(NugetCommands)" />
32+
<PackageReference Include="vswhere" Version="$(VSWherePackageVersion)" PrivateAssets="All" />
33+
<PackageReference Include="Microsoft.DotNet.SignTool" Version="$(MicrosoftDotNetSignToolPackageVersion)" ExcludeAssets="All" PrivateAssets="All" />
34+
<PackageReference Include="Microsoft.DotNet.SignCheck" Version="$(MicrosoftDotNetSignCheckPackageVersion)" ExcludeAssets="All" PrivateAssets="All" />
35+
</ItemGroup>
36+
37+
<Target Name="PublishGeneratedProps" BeforeTargets="Publish">
38+
<PropertyGroup>
39+
<PackageVersionsPropsContent>
40+
<![CDATA[
41+
<Project>
42+
<PropertyGroup>
43+
<MicroBuildCorePackageVersion>$(MicroBuildCorePackageVersion)</MicroBuildCorePackageVersion>
44+
</PropertyGroup>
45+
</Project>
46+
]]>
47+
</PackageVersionsPropsContent>
48+
</PropertyGroup>
49+
50+
<WriteLinesToFile File="$(PublishDir)PackageVersions.props" Lines="$(PackageVersionsPropsContent)" Overwrite="true" />
51+
</Target>
52+
53+
</Project>

‎test/KoreBuild.Tasks.Tests/KoreBuild.Tasks.Tests.csproj

Lines changed: 39 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,39 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
3-
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.1</TargetFramework>
5-
</PropertyGroup>
6-
7-
<ItemGroup>
8-
<Compile Include="..\shared\*" />
9-
<Content Include="..\..\files\KoreBuild\scripts\dotnet-install.*" CopyToOutputDirectory="PreserveNewest" />
10-
<Content Include="$(VSWhereDir)vswhere.exe" CopyToOutputDirectory="PreserveNewest" />
11-
</ItemGroup>
12-
13-
<ItemGroup>
14-
<PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildPackageVersion)" />
15-
<PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkPackageVersion)" />
16-
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCorePackageVersion)" />
17-
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCorePackageVersion)" />
18-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
19-
<PackageReference Include="Moq" Version="$(MoqPackageVersion)" />
20-
<PackageReference Include="NuGet.Build.Tasks" Version="$(Tooling_NuGetBuildTasksPackageVersion)" />
21-
<PackageReference Include="vswhere" Version="$(VsWherePackageVersion)" />
22-
<PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
23-
<PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualStudioPackageVersion)" />
24-
</ItemGroup>
25-
26-
<ItemGroup>
27-
<ProjectReference Include="..\..\modules\KoreBuild.Tasks\KoreBuild.Tasks.csproj" />
28-
</ItemGroup>
29-
30-
<ItemGroup>
31-
<None Update="TestResources\lorem.bin">
32-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
33-
</None>
34-
</ItemGroup>
35-
36-
</Project>
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>netcoreapp2.1</TargetFramework>
5+
</PropertyGroup>
6+
7+
<ItemGroup>
8+
<Compile Include="..\shared\*" />
9+
<Content Include="..\..\files\KoreBuild\scripts\dotnet-install.*" CopyToOutputDirectory="PreserveNewest" />
10+
<Content Include="$(VSWhereDir)vswhere.exe" CopyToOutputDirectory="PreserveNewest" />
11+
</ItemGroup>
12+
13+
<ItemGroup>
14+
<PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildPackageVersion)" />
15+
<PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkPackageVersion)" />
16+
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCorePackageVersion)" />
17+
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCorePackageVersion)" />
18+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
19+
<PackageReference Include="Moq" Version="$(MoqPackageVersion)" />
20+
<PackageReference Include="NuGet.Build.Tasks" Version="$(Tooling_NuGetBuildTasksPackageVersion)" />
21+
<PackageReference Include="NuGet.Packaging" Version="$(NugetPackaging)" />
22+
<PackageReference Include="NuGet.Protocol" Version="$(NugetProtocol)" />
23+
<PackageReference Include="NuGet.Commands" Version="$(NugetCommands)" />
24+
<PackageReference Include="vswhere" Version="$(VsWherePackageVersion)" />
25+
<PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
26+
<PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualStudioPackageVersion)" />
27+
</ItemGroup>
28+
29+
<ItemGroup>
30+
<ProjectReference Include="..\..\modules\KoreBuild.Tasks\KoreBuild.Tasks.csproj" />
31+
</ItemGroup>
32+
33+
<ItemGroup>
34+
<None Update="TestResources\lorem.bin">
35+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
36+
</None>
37+
</ItemGroup>
38+
39+
</Project>

0 commit comments

Comments
 (0)