зеркало из https://github.com/microsoft/vs-mef.git
Merge remote-tracking branch 'libtemplate/microbuild' into libtemplateUpdate
This commit is contained in:
Коммит
099a7d3be1
|
@ -1,4 +1,5 @@
|
|||
FROM mcr.microsoft.com/dotnet/sdk:6.0.401-focal
|
||||
# Refer to https://hub.docker.com/_/microsoft-dotnet-sdk for available versions
|
||||
FROM mcr.microsoft.com/dotnet/sdk:7.0.101-jammy
|
||||
|
||||
# Installing mono makes `dotnet test` work without errors even for net472.
|
||||
# But installing it takes a long time, so it's excluded by default.
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
<BaseIntermediateOutputPath>$(RepoRootPath)obj\$([MSBuild]::MakeRelative($(RepoRootPath), $(MSBuildProjectDirectory)))\</BaseIntermediateOutputPath>
|
||||
<BaseOutputPath Condition=" '$(BaseOutputPath)' == '' ">$(RepoRootPath)bin\$(MSBuildProjectName)\</BaseOutputPath>
|
||||
<PackageOutputPath>$(RepoRootPath)bin\Packages\$(Configuration)\NuGet\</PackageOutputPath>
|
||||
<LangVersion>10.0</LangVersion>
|
||||
<LangVersion>latest</LangVersion>
|
||||
<Nullable>enable</Nullable>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<AnalysisLevel>latest</AnalysisLevel>
|
||||
|
@ -67,23 +67,15 @@
|
|||
|
||||
<!--
|
||||
Inspired by https://github.com/dotnet/arcade/blob/cbfa29d4e859622ada3d226f90f103f659665d31/src/Microsoft.DotNet.Arcade.Sdk/tools/Workarounds.props#L14-L31
|
||||
WPF temp-projects do not import .props and .targets files from NuGet packages.
|
||||
(see https://github.com/dotnet/sourcelink/issues/91).
|
||||
|
||||
Property _TargetAssemblyProjectName is set by GenerateTemporaryTargetAssembly task.
|
||||
Disable Source Link and Xliff in WPF temp projects to avoid generating non-deterministic file names to obj dir.
|
||||
The project name is non-deterministic and is included in the Source Link json file name and xlf directory names.
|
||||
It's also not necessary to generate these assets.
|
||||
-->
|
||||
<PropertyGroup Condition="'$(IsWpfTempProject)' == 'true'">
|
||||
<_WpfTempProjectNuGetFilePathNoExt>$(BaseIntermediateOutputPath)..\$(_TargetAssemblyProjectName)\$(_TargetAssemblyProjectName)$(MSBuildProjectExtension).nuget.g</_WpfTempProjectNuGetFilePathNoExt>
|
||||
|
||||
<EnableSourceLink>false</EnableSourceLink>
|
||||
<EmbedUntrackedSources>false</EmbedUntrackedSources>
|
||||
<DeterministicSourcePaths>false</DeterministicSourcePaths>
|
||||
<EnableXlfLocalization>false</EnableXlfLocalization>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- Workaround https://github.com/dotnet/wpf/issues/810 -->
|
||||
<Import Project="$(_WpfTempProjectNuGetFilePathNoExt).props" Condition="'$(_WpfTempProjectNuGetFilePathNoExt)' != '' and Exists('$(_WpfTempProjectNuGetFilePathNoExt).props')"/>
|
||||
</Project>
|
||||
|
|
|
@ -4,5 +4,8 @@
|
|||
<EmbedUntrackedSources Condition=" '$(UseWPF)' == 'true' ">false</EmbedUntrackedSources>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="$(_WpfTempProjectNuGetFilePathNoExt).targets" Condition="'$(_WpfTempProjectNuGetFilePathNoExt)' != '' and Exists('$(_WpfTempProjectNuGetFilePathNoExt).targets')"/>
|
||||
<ItemGroup>
|
||||
<!-- Avoid compile error about missing namespace when combining ImplicitUsings with .NET Framework target frameworks. -->
|
||||
<Using Remove="System.Net.Http" Condition="'$(TargetFrameworkIdentifier)'=='.NETFramework'" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
|
@ -22,9 +22,9 @@
|
|||
<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.3" />
|
||||
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.XUnit" Version="1.1.1" />
|
||||
<PackageVersion Include="DiffPlex" Version="1.7.1" />
|
||||
<PackageVersion Include="Microsoft.CodeCoverage" Version="17.5.0-preview-20221201-01" />
|
||||
<PackageVersion Include="Microsoft.CodeCoverage" Version="17.5.0-release-20221220-01" />
|
||||
<PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
|
||||
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
|
||||
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
|
||||
<PackageVersion Include="Microsoft.VisualStudio.Internal.MicroBuild.NonShipping" Version="$(MicroBuildVersion)" />
|
||||
<PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.4.27" />
|
||||
<PackageVersion Include="Microsoft.VisualStudio.Validation" Version="17.0.53" />
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"sdk": {
|
||||
"version": "7.0.100",
|
||||
"version": "7.0.101",
|
||||
"rollForward": "patch",
|
||||
"allowPrerelease": false
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче