Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<PatchVersion>0</PatchVersion>
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
<PreReleaseVersionIteration>2</PreReleaseVersionIteration>
<PreReleaseVersionIteration Condition="$(MSBuildProjectName.StartsWith('Microsoft.Extensions.'))">$(PreReleaseVersionIteration)-runtime</PreReleaseVersionIteration>
<!-- Set assembly version to align with major and minor version,
as for the patches and revisions should be manually updated per assembly if it is serviced. -->
<AssemblyVersion>$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
Expand Down
3 changes: 3 additions & 0 deletions src/libraries/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,9 @@
<!-- Paths to binplace package content -->
<NETCoreAppPackageRefPath>$(ArtifactsBinDir)pkg\$(NetCoreAppCurrent)\ref</NETCoreAppPackageRefPath>
<NETCoreAppPackageRuntimePath>$(ArtifactsBinDir)pkg\$(NetCoreAppCurrent)\lib</NETCoreAppPackageRuntimePath>

<ASPNETCoreAppPackageRefPath>$(ArtifactsBinDir)pkg\aspnetcoreapp\ref</ASPNETCoreAppPackageRefPath>
<ASPNETCoreAppPackageRuntimePath>$(ArtifactsBinDir)pkg\aspnetcoreapp\lib</ASPNETCoreAppPackageRuntimePath>

<TestHostRootPath>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'testhost', '$(BuildConfiguration)'))</TestHostRootPath>

Expand Down
4 changes: 4 additions & 0 deletions src/libraries/Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,10 @@
<!-- enable trimming for any runtime project that's part of the shared framework and hasn't already set ILLinkTrimAssembly -->
<SetProperties Condition="'$(BinPlaceRuntime)' == 'true' and '$(ILLinkTrimAssembly)' == ''">ILLinkTrimAssembly=true</SetProperties>
</BinPlaceTargetFrameworks>
<BinPlaceTargetFrameworks Condition="'$(IsAspNetCoreApp)' == 'true'" Include="$(NetCoreAppCurrent)">
<RuntimePath>$(ASPNETCoreAppPackageRuntimePath)</RuntimePath>
<RefPath>$(ASPNETCoreAppPackageRefPath)</RefPath>
</BinPlaceTargetFrameworks>

<!-- Setup the shared framework directory for testing -->
<BinPlaceTargetFrameworks Condition="'$(BinPlaceTestSharedFramework)' == 'true'" Include="$(NetCoreAppCurrent)-$(OSGroup)">
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<Project>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>MicrosoftAspNetCore</StrongNameKeyId>
<IsAspNetCoreApp>true</IsAspNetCoreApp>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29521.150
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D69C4529-128C-4A51-AD5A-659872A4F405}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "src\Microsoft.Extensions.Primitives.csproj", "{31785605-3555-4D71-8B24-59DC43F7439A}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{0EB2C914-0873-4AF8-9262-75B1405C842A}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{33BE7927-9C98-425D-97F5-D68510163F6C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "ref\Microsoft.Extensions.Primitives.csproj", "{7A3952AC-BA1B-4A00-B45B-92DE4D3B36E5}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives.Tests", "tests\Microsoft.Extensions.Primitives.Tests.csproj", "{E5CBC6DD-9C09-483A-A27A-F1F1FA2DFBAA}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{31785605-3555-4D71-8B24-59DC43F7439A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{31785605-3555-4D71-8B24-59DC43F7439A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{31785605-3555-4D71-8B24-59DC43F7439A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{31785605-3555-4D71-8B24-59DC43F7439A}.Release|Any CPU.Build.0 = Release|Any CPU
{7A3952AC-BA1B-4A00-B45B-92DE4D3B36E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7A3952AC-BA1B-4A00-B45B-92DE4D3B36E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7A3952AC-BA1B-4A00-B45B-92DE4D3B36E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7A3952AC-BA1B-4A00-B45B-92DE4D3B36E5}.Release|Any CPU.Build.0 = Release|Any CPU
{E5CBC6DD-9C09-483A-A27A-F1F1FA2DFBAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E5CBC6DD-9C09-483A-A27A-F1F1FA2DFBAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E5CBC6DD-9C09-483A-A27A-F1F1FA2DFBAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E5CBC6DD-9C09-483A-A27A-F1F1FA2DFBAA}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{31785605-3555-4D71-8B24-59DC43F7439A} = {D69C4529-128C-4A51-AD5A-659872A4F405}
{7A3952AC-BA1B-4A00-B45B-92DE4D3B36E5} = {33BE7927-9C98-425D-97F5-D68510163F6C}
{E5CBC6DD-9C09-483A-A27A-F1F1FA2DFBAA} = {0EB2C914-0873-4AF8-9262-75B1405C842A}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {EC9E15A7-A8F7-486B-B7EA-59341203A4D3}
EndGlobalSection
EndGlobal
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<Project DefaultTargets="Build">
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
<ItemGroup>
<ProjectReference Include="..\src\Microsoft.Extensions.Primitives.csproj">
<SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
</ProjectReference>
</ItemGroup>
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
</Project>
Loading