huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix MSB4062 - fix conflicting build tools dependencies by ensuring the same version is used

This commit is contained in:
Nate McMaster 2018-11-19 11:16:03 -08:00
parent 137a72f85d
commit 9954f5a703
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/repo.props
View File

@ -50,7 +50,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<SamplesProject Include="$(RepositoryRoot)src\samples\**\*.csproj;"/> <SamplesProject Include="$(RepositoryRoot)src\**\samples\**\*.csproj;"/>
<ProjectToExclude Include="@(SamplesProject)" Condition="'$(BuildSamples)' == 'false' "/> <ProjectToExclude Include="@(SamplesProject)" Condition="'$(BuildSamples)' == 'false' "/>

5
src/SiteExtensions/Directory.Build.props
View File

@ -5,4 +5,9 @@
<Import Project="build\dependencies.props" /> <Import Project="build\dependencies.props" />
<Import Project="version.props" /> <Import Project="version.props" />
<PropertyGroup>
<EnableApiCheck>false</EnableApiCheck>
<GenerateSourceLinkFile>false</GenerateSourceLinkFile>
</PropertyGroup>
</Project> </Project>

7
src/SiteExtensions/build/dependencies.props
View File

@ -3,14 +3,11 @@
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects> <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
</PropertyGroup> </PropertyGroup>
<Import Project="..\..\..\build\dependencies.props" />
<PropertyGroup Label="Package Versions"> <PropertyGroup Label="Package Versions">
<InternalAspNetCoreSdkPackageVersion>3.0.0-build-20181114.5</InternalAspNetCoreSdkPackageVersion>
<MicrosoftAspNetCoreAzureAppServicesSiteExtension21PackageVersion>2.1.1-rtm-31076</MicrosoftAspNetCoreAzureAppServicesSiteExtension21PackageVersion> <MicrosoftAspNetCoreAzureAppServicesSiteExtension21PackageVersion>2.1.1-rtm-31076</MicrosoftAspNetCoreAzureAppServicesSiteExtension21PackageVersion>
<MicrosoftAspNetCoreAzureAppServicesSiteExtension22PackageVersion>2.2.0-rtm-35515</MicrosoftAspNetCoreAzureAppServicesSiteExtension22PackageVersion> <MicrosoftAspNetCoreAzureAppServicesSiteExtension22PackageVersion>2.2.0-rtm-35515</MicrosoftAspNetCoreAzureAppServicesSiteExtension22PackageVersion>
<MicrosoftNETTestSdkPackageVersion>15.6.1</MicrosoftNETTestSdkPackageVersion>
<MicrosoftWebXdtPackageVersion>1.4.0</MicrosoftWebXdtPackageVersion>
<XunitPackageVersion>2.4.0</XunitPackageVersion>
<XunitRunnerVisualStudioPackageVersion>2.4.0</XunitRunnerVisualStudioPackageVersion>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

9
src/SiteExtensions/build/repo.props
View File

@ -1,8 +1,7 @@
<Project> <Project>
<PropertyGroup>
<ItemGroup> <!-- Disable KoreBuild restrictions while we re-work dependency management. -->
<ExcludeFromPack Include="$(RepositoryRoot)src\Microsoft.Web.Xdt.Extensions\*.csproj" /> <DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions>
</ItemGroup> </PropertyGroup>
</Project> </Project>

4
src/SiteExtensions/global.json
View File

@ -1,8 +1,8 @@
{ {
"sdk": { "sdk": {
"version": "2.2.100-preview3-009430" "version": "3.0.100-preview-009750"
}, },
"msbuild-sdks": { "msbuild-sdks": {
"Internal.AspNetCore.Sdk": "3.0.0-alpha1-20181018.6" "Internal.AspNetCore.Sdk": "3.0.0-build-20181114.5"
} }
} }

5
src/SiteExtensions/src/Microsoft.Web.Xdt.Extensions/Microsoft.Web.Xdt.Extensions.csproj
View File

@ -3,12 +3,11 @@
<PropertyGroup> <PropertyGroup>
<Description>Additional functionality for Xdt transforms.</Description> <Description>Additional functionality for Xdt transforms.</Description>
<TargetFramework>net461</TargetFramework> <TargetFramework>net461</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile> <IsPackable>false</IsPackable>
<PackageTags>xdt</PackageTags>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Web.Xdt" Version="$(MicrosoftWebXdtPackageVersion)" /> <PackageReference Include="Microsoft.Web.Xdt" Version="$(MicrosoftWebXdtPackageVersion)" />
</ItemGroup> </ItemGroup>
</Project> </Project>