Skip to content

Commit 1c67cc3

Browse files
akoeplingerakoeplinger
committed
Migrate to PackageReference
1 parent a37b87a commit 1c67cc3

File tree

86 files changed

+194
-1835
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+194
-1835
lines changed

‎.nuget/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
<package id="Microsoft.Web.StyleCop" version="1.0.0" />
55
<package id="StyleCop" version="5.0.0" />
66
<package id="xunit.runner.msbuild" version="2.4.2" targetFramework="net452" />
7-
</packages>
7+
</packages>

‎Directory.Build.props‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@
1111
<SuppressLegacyCodeAnalysisDeprecatedWarning>true</SuppressLegacyCodeAnalysisDeprecatedWarning>
1212
<!-- Workaround continued use of netcoreapp2.1; suppress the NETSDK1138 warning. -->
1313
<CheckEolTargetFramework>false</CheckEolTargetFramework>
14+
<!-- Workaround continued use of netstandard1.x; suppress the NETSDK1215 warning. -->
15+
<CheckNotRecommendedTargetFramework>false</CheckNotRecommendedTargetFramework>
1416
</PropertyGroup>
1517

18+
<ItemGroup>
19+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All" />
20+
</ItemGroup>
21+
1622
</Project>

‎Runtime.msbuild‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<_Testing_NetStandard1_3 Include="true;false" />
5757
</ItemGroup>
5858

59-
<Target Name="RestorePackages" DependsOnTargets="DownloadNuGet">
59+
<Target Name="RestorePackages">
6060
<Message Text="%0ARestoring NuGet packages..." Importance="High" />
6161

6262
<!--
@@ -68,13 +68,15 @@
6868
BuildInParallel="true"
6969
Properties="Configuration=$(Configuration);CodeAnalysis=$(CodeAnalysis);StyleCopEnabled=$(StyleCopEnabled);
7070
RestorePackagesConfig=true;VisualStudioVersion=$(VisualStudioVersion);
71-
Testing_NetStandard1_3=%(_Testing_NetStandard1_3.Identity)"
71+
Testing_NetStandard1_3=%(_Testing_NetStandard1_3.Identity);
72+
MSBuildRestoreSessionId=$([System.Guid]::NewGuid())"
7273
RemoveProperties="Platform" />
7374

7475
<MSBuild Projects="Runtime.sln" Targets="Restore"
7576
BuildInParallel="$(RestoreInParallel)"
7677
Properties="Configuration=$(Configuration);CodeAnalysis=$(CodeAnalysis);StyleCopEnabled=$(StyleCopEnabled);
77-
RestorePackagesConfig=true;VisualStudioVersion=$(VisualStudioVersion)" />
78+
RestorePackagesConfig=true;VisualStudioVersion=$(VisualStudioVersion);
79+
MSBuildRestoreSessionId=$([System.Guid]::NewGuid())" />
7880
<Message Importance="High" Text="" />
7981
</Target>
8082

‎eng/templates/default-build.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,11 @@ jobs:
4646
inputs:
4747
packageType: runtime
4848
version: '2.1.x'
49+
- task: UseDotNet@2
50+
displayName: Get .NET 6.0 runtime
51+
inputs:
52+
packageType: runtime
53+
version: '6.0.x'
4954

5055
- script: .\build.cmd EnableSkipStrongNames
5156
displayName: Enable SkipStrongNames

‎packages/repositories.config‎

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎src/Microsoft.AspNet.Facebook/Microsoft.AspNet.Facebook.csproj‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,11 @@
2222
<DefineConstants>TRACE;CODE_ANALYSIS;ASPNETFACEBOOK</DefineConstants>
2323
</PropertyGroup>
2424
<ItemGroup>
25-
<Reference Include="Facebook, Version=6.0.10.0, Culture=neutral, PublicKeyToken=58cb4f2111d1e6de, processorArchitecture=MSIL">
26-
<SpecificVersion>False</SpecificVersion>
27-
<HintPath>..\..\packages\Facebook.6.4.2\lib\net45\Facebook.dll</HintPath>
28-
</Reference>
29-
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
30-
<HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
31-
<SpecificVersion>False</SpecificVersion>
32-
<Private>False</Private>
33-
</Reference>
25+
<PackageReference Include="Facebook" Version="6.4.2" />
26+
<PackageReference Include="Microsoft.Web.Infrastructure" Version="1.0.0.0" />
27+
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" PrivateAssets="All" />
28+
</ItemGroup>
29+
<ItemGroup>
3430
<Reference Include="System" />
3531
<Reference Include="System.ComponentModel.DataAnnotations" />
3632
<Reference Include="System.configuration" />
@@ -92,11 +88,7 @@
9288
<Link>Properties\CommonAssemblyInfo.cs</Link>
9389
</Compile>
9490
</ItemGroup>
95-
<ItemGroup>
96-
<None Include="packages.config">
97-
<SubType>Designer</SubType>
98-
</None>
99-
</ItemGroup>
91+
10092
<ItemGroup>
10193
<EmbeddedResource Include="Resources.resx">
10294
<Generator>ResXFileCodeGenerator</Generator>

‎src/Microsoft.AspNet.Facebook/packages.config‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎src/Microsoft.Web.Helpers/Microsoft.Web.Helpers.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313
<DefineConstants>$(DefineConstants);ASPNETWEBPAGES</DefineConstants>
1414
<NoWarn>1591</NoWarn>
1515
</PropertyGroup>
16+
<ItemGroup>
17+
<!-- Note: RazorGenerator.MsBuild uses Razor 3.0 \ Mvc 5.0 for generating views. In the event we update the Mvc parser, we'll need to ensure this package references the updated Mvc build -->
18+
<PackageReference Include="RazorGenerator.MsBuild" Version="2.2.0" />
19+
</ItemGroup>
1620
<ItemGroup>
1721
<CodeAnalysisDictionary Include="..\CodeAnalysisDictionary.xml" />
1822
</ItemGroup>
@@ -95,7 +99,6 @@
9599
</ProjectReference>
96100
</ItemGroup>
97101
<ItemGroup>
98-
<None Include="packages.config" />
99102
<RazorSrcFiles Include="Analytics.cshtml" />
100103
<RazorSrcFiles Include="FileUpload.cshtml" />
101104
<RazorSrcFiles Include="GamerCard.cshtml" />
@@ -105,7 +108,4 @@
105108
<RazorSrcFiles Include="Maps.cshtml" />
106109
</ItemGroup>
107110
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
108-
109-
<!-- Note: RazorGenerator.MsBuild uses Razor 3.0 \ Mvc 5.0 for generating views. In the event we update the Mvc parser, we'll need to ensure this package references the updated Mvc build -->
110-
<Import Project="..\..\packages\RazorGenerator.MsBuild.2.2.0\build\RazorGenerator.MsBuild.targets" Condition="Exists('..\..\packages\RazorGenerator.MsBuild.2.2.0\build\RazorGenerator.MsBuild.targets')" />
111111
</Project>

‎src/Microsoft.Web.Helpers/packages.config‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎src/Microsoft.Web.WebPages.OAuth/Microsoft.Web.WebPages.OAuth.csproj‎

Lines changed: 10 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -16,30 +16,15 @@
1616
<CodeAnalysisDictionary Include="..\CodeAnalysisDictionary.xml" />
1717
</ItemGroup>
1818
<ItemGroup>
19-
<Reference Include="DotNetOpenAuth.AspNet, Version=4.0.0.0, Culture=neutral, PublicKeyToken=2780ccd10d57b246, processorArchitecture=MSIL">
20-
<SpecificVersion>False</SpecificVersion>
21-
<HintPath>..\..\packages\DotNetOpenAuth.AspNet.4.0.3.12153\lib\net40-full\DotNetOpenAuth.AspNet.dll</HintPath>
22-
</Reference>
23-
<Reference Include="DotNetOpenAuth.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=2780ccd10d57b246, processorArchitecture=MSIL">
24-
<SpecificVersion>False</SpecificVersion>
25-
<HintPath>..\..\packages\DotNetOpenAuth.Core.4.0.3.12153\lib\net40-full\DotNetOpenAuth.Core.dll</HintPath>
26-
</Reference>
27-
<Reference Include="DotNetOpenAuth.OAuth, Version=4.0.0.0, Culture=neutral, PublicKeyToken=2780ccd10d57b246, processorArchitecture=MSIL">
28-
<SpecificVersion>False</SpecificVersion>
29-
<HintPath>..\..\packages\DotNetOpenAuth.OAuth.Core.4.0.3.12153\lib\net40-full\DotNetOpenAuth.OAuth.dll</HintPath>
30-
</Reference>
31-
<Reference Include="DotNetOpenAuth.OAuth.Consumer, Version=4.0.0.0, Culture=neutral, PublicKeyToken=2780ccd10d57b246, processorArchitecture=MSIL">
32-
<SpecificVersion>False</SpecificVersion>
33-
<HintPath>..\..\packages\DotNetOpenAuth.OAuth.Consumer.4.0.3.12153\lib\net40-full\DotNetOpenAuth.OAuth.Consumer.dll</HintPath>
34-
</Reference>
35-
<Reference Include="DotNetOpenAuth.OpenId, Version=4.0.0.0, Culture=neutral, PublicKeyToken=2780ccd10d57b246, processorArchitecture=MSIL">
36-
<SpecificVersion>False</SpecificVersion>
37-
<HintPath>..\..\packages\DotNetOpenAuth.OpenId.Core.4.0.3.12153\lib\net40-full\DotNetOpenAuth.OpenId.dll</HintPath>
38-
</Reference>
39-
<Reference Include="DotNetOpenAuth.OpenId.RelyingParty, Version=4.0.0.0, Culture=neutral, PublicKeyToken=2780ccd10d57b246, processorArchitecture=MSIL">
40-
<SpecificVersion>False</SpecificVersion>
41-
<HintPath>..\..\packages\DotNetOpenAuth.OpenId.RelyingParty.4.0.3.12153\lib\net40-full\DotNetOpenAuth.OpenId.RelyingParty.dll</HintPath>
42-
</Reference>
19+
<PackageReference Include="CodeContracts.Unofficial" Version="1.0.0.0" />
20+
<PackageReference Include="DotNetOpenAuth.AspNet" Version="4.0.3.12153" />
21+
<PackageReference Include="DotNetOpenAuth.Core" Version="4.0.3.12153" />
22+
<PackageReference Include="DotNetOpenAuth.OAuth.Consumer" Version="4.0.3.12153" />
23+
<PackageReference Include="DotNetOpenAuth.OAuth.Core" Version="4.0.3.12153" />
24+
<PackageReference Include="DotNetOpenAuth.OpenId.Core" Version="4.0.3.12153" />
25+
<PackageReference Include="DotNetOpenAuth.OpenId.RelyingParty" Version="4.0.3.12153" />
26+
</ItemGroup>
27+
<ItemGroup>
4328
<Reference Include="System" />
4429
<Reference Include="System.Configuration" />
4530
<Reference Include="System.Core" />
@@ -108,9 +93,7 @@
10893
<LastGenOutput>OAuthResources.Designer.cs</LastGenOutput>
10994
</EmbeddedResource>
11095
</ItemGroup>
111-
<ItemGroup>
112-
<None Include="packages.config" />
113-
</ItemGroup>
96+
11497
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
11598
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
11699
Other similar extension points exist, see Microsoft.Common.targets.

0 commit comments

Comments
 (0)