Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Consume projections via nupkg vs. checked-in binaries #2733

Open
wants to merge 17 commits into
base: develop
Choose a base branch
from
Open

Consume projections via nupkg vs. checked-in binaries #2733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
8f0868a
Removal of projection binaries
May 24, 2017
24dda75
Remove [Projections] Universal Windows UWP headers
May 24, 2017
c822b64
Remove [Projection] Microsoft Advertising headers
May 24, 2017
ae074c7
Initial commit of Frameworks.UWP/MSAds projections
May 26, 2017
ace0789
remove WinObjc.Frameworks.UWP project from the main build
May 26, 2017
b42f6ab
Remove the old prebuilts packing WinObjC.Frameworks.UWP project
May 26, 2017
7e82b8c
remove the reference to the old UWP.nuproj that packaged the pre-builts
May 26, 2017
faa7ebb
remove the guid for pre-packed projections project
May 27, 2017
e4018f1
Remove the projections code, this will be automatically generated'
May 31, 2017
0324a42
Add project reference for UWP packages
May 31, 2017
c2b97b6
Let nuget look at locally built packages in build\outputpackages
May 31, 2017
d7b2d73
Support the exclusion of referencing Frameworks.UWP for Frameworks.Co…
May 31, 2017
8c660f9
Ignore warnings from UWP headers
Jun 1, 2017
1e05951
Make starboard unit tests automatically resolve Frameworks.UWP package
Jun 1, 2017
d5aae69
ensure functional tests reference and resolve nuget package directly
Jun 1, 2017
3fa0f34
make addressbook test reference Frameworks.UWP package
Jun 1, 2017
4e5e83b
move package reference together
Jun 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions build/CFNetwork/lib/CFNetworkLib.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
<ProjectName>CFNetworkLib</ProjectName>
<RootNamespace>CFNetworkLib</RootNamespace>
<AppContainerApplication>true</AppContainerApplication>
<BuildingFrameworksCore>true</BuildingFrameworksCore>
<StarboardBasePath>$(MSBuildThisFileDirectory)..\..\..</StarboardBasePath>
<OutputName>CFNetworkLib</OutputName>
</PropertyGroup>
Expand Down
1 change: 1 addition & 0 deletions build/CoreFoundation/lib/CoreFoundationLib.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@
<ProjectGuid>{DC123A21-ECF5-4C43-9E69-25CEA438EE94}</ProjectGuid>
<ProjectName>CoreFoundationLib</ProjectName>
<RootNamespace>CoreFoundationLib</RootNamespace>
<BuildingFrameworksCore>true</BuildingFrameworksCore>
<AppContainerApplication>true</AppContainerApplication>
<StarboardBasePath>$(MSBuildThisFileDirectory)..\..\..</StarboardBasePath>
<OutputName>CoreFoundationLib</OutputName>
Expand Down
1 change: 1 addition & 0 deletions build/CoreFoundationAdditions/lib/CoreFoundationAdditionsLib.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
<ProjectName>CoreFoundationAdditionsLib</ProjectName>
<RootNamespace>CoreFoundationAdditionsLib</RootNamespace>
<AppContainerApplication>true</AppContainerApplication>
<BuildingFrameworksCore>true</BuildingFrameworksCore>
<StarboardBasePath>$(MSBuildThisFileDirectory)..\..\..</StarboardBasePath>
<OutputName>CoreFoundationAdditionsLib</OutputName>
</PropertyGroup>
Expand Down
1 change: 1 addition & 0 deletions build/Foundation/lib/FoundationLib.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,7 @@
<ProjectName>FoundationLib</ProjectName>
<RootNamespace>FoundationLib</RootNamespace>
<AppContainerApplication>true</AppContainerApplication>
<BuildingFrameworksCore>true</BuildingFrameworksCore>
<StarboardBasePath>$(MSBuildThisFileDirectory)..\..\..</StarboardBasePath>
<OutputName>FoundationLib</OutputName>
</PropertyGroup>
Expand Down
1 change: 1 addition & 0 deletions build/MobileCoreServices/lib/MobileCoreServicesLib.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<ProjectName>MobileCoreservicesLib</ProjectName>
<RootNamespace>MobileCoreservicesLib</RootNamespace>
<AppContainerApplication>true</AppContainerApplication>
<BuildingFrameworksCore>true</BuildingFrameworksCore>
<StarboardBasePath>$(MSBuildThisFileDirectory)..\..\..</StarboardBasePath>
<OutputName>MobileCoreservicesLib</OutputName>
</PropertyGroup>
Expand Down
1 change: 1 addition & 0 deletions build/Starboard/lib/StarboardLib.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
<ProjectName>StarboardLib</ProjectName>
<RootNamespace>StarboardLib</RootNamespace>
<AppContainerApplication>true</AppContainerApplication>
<BuildingFrameworksCore>true</BuildingFrameworksCore>
<StarboardBasePath>$(MSBuildThisFileDirectory)..\..\..</StarboardBasePath>
<OutputName>StarboardLib</OutputName>
</PropertyGroup>
Expand Down
3 changes: 3 additions & 0 deletions build/Tests/FunctionalTests/FunctionalTests.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,9 @@
<Project>{48B2B4F1-50D5-4772-B4A4-8D2C23AB3B67}</Project>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="WinObjC.Frameworks.UWP" Version="*" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{4fdf4507-8c1e-4617-9278-11d4bfe8f3a5}</ProjectGuid>
<Keyword>DynamicLibrary</Keyword>
Expand Down
3 changes: 3 additions & 0 deletions build/Tests/UnitTests/AddressBook/AddressBook.UnitTests.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,9 @@
<ClangCompile Include="$(StarboardBasePath)\tests\unittests\AddressBook\ModifyContactsTests.mm" />
<ClangCompile Include="$(StarboardBasePath)\Frameworks\AddressBook\NSDate+AddressBookAdditions.mm" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="WinObjC.Frameworks.UWP" Version="*" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<Import Project="$(StarboardBasePath)\common\winobjc.packagereference.override.targets" Condition="Exists('$(StarboardBasePath)\common\winobjc.packagereference.override.targets')"/>
</Project>
3 changes: 3 additions & 0 deletions build/Tests/UnitTests/Starboard/Starboard.UnitTests.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,9 @@
<ItemGroup>
<ClInclude Include="..\..\..\..\tests\unittests\Starboard\LifetimeCounting.h" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="WinObjC.Frameworks.UWP" Version="*" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<Import Project="$(StarboardBasePath)\common\winobjc.packagereference.override.targets" Condition="Exists('$(StarboardBasePath)\common\winobjc.packagereference.override.targets')"/>
</Project>
5 changes: 0 additions & 5 deletions build/WinObjC.Frameworks.UWP/Readme.txt
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions build/WinObjC.Frameworks.UWP/WinObjC.Frameworks.UWP.Packaging.props
View file
Open in desktop

This file was deleted.

32 changes: 0 additions & 32 deletions build/WinObjC.Frameworks.UWP/WinObjC.Frameworks.UWP.Packaging.targets
View file
Open in desktop

This file was deleted.

68 changes: 0 additions & 68 deletions build/WinObjC.Frameworks.UWP/WinObjC.Frameworks.UWP.nuproj
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions build/WinObjC.Frameworks.UWP/WinObjC.Frameworks.UWP.props
View file
Open in desktop

This file was deleted.

40 changes: 0 additions & 40 deletions build/WinObjC.Frameworks.UWP/WinObjC.Frameworks.UWP.targets
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions build/WinObjC.Frameworks/WinObjC.Frameworks.nuproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,6 @@
</ItemGroup>

<!-- NuProj Project References. Ensure that these only get evaluated once by checking that this isn't the second time through this project -->
<ItemGroup Condition="'$(SkipGetPackageContentsForOtherPlatforms)' != 'true'">
<ProjectReference Include="$(MSBuildThisFileDirectory)..\WinObjC.Frameworks.UWP\WinObjC.Frameworks.UWP.nuproj" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" />
<Import Project="$(NuGetAuthoringPath)\NuGet.Packaging.Authoring.targets" Condition="Exists('$(NuGetAuthoringPath)\NuGet.Packaging.Authoring.targets')" />
<Import Project="WinObjC.Frameworks.Packaging.targets" />
Expand Down
3 changes: 0 additions & 3 deletions build/build.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -772,8 +772,6 @@ Project("{5DD5E4FA-CB73-4610-85AB-557B54E96AA9}") = "WinObjC.Frameworks.Core", "
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Package", "Package", "{F0F1B2A3-6924-4A09-99CE-D08CD8BCF392}"
EndProject
Project("{5DD5E4FA-CB73-4610-85AB-557B54E96AA9}") = "WinObjC.Frameworks.UWP", "WinObjC.Frameworks.UWP\WinObjC.Frameworks.UWP.nuproj", "{B0F24416-5500-4A60-815B-8E08E9F3717A}"
EndProject
Project("{5DD5E4FA-CB73-4610-85AB-557B54E96AA9}") = "WinObjC.Frameworks", "WinObjC.Frameworks\WinObjC.Frameworks.nuproj", "{BEF15618-E03F-4A44-A797-9150C979B09F}"
EndProject
Project("{13B669BE-BB05-4DDF-9536-439F39A36129}") = "TestPlatformMultiplexer", "BuildSupport\TestPlatformMultiplexer.msbuildproj", "{60A07842-5D75-45E8-9FCF-C126E608B654}"
Expand Down Expand Up @@ -2726,7 +2724,6 @@ Global
{ED31F79B-D4B3-4D15-A134-1108B0659C98} = {58128019-F022-44F1-9D59-811230051CD8}
{1751F526-3CE3-46CB-8724-E250410D600E} = {FC5C7CDB-1E45-4122-B6A7-CF8D4A60F6D0}
{F0F1B2A3-6924-4A09-99CE-D08CD8BCF392} = {E1BA5F74-6863-437D-9AF5-72666F6D25B5}
{B0F24416-5500-4A60-815B-8E08E9F3717A} = {312A2B08-9A28-468E-B74C-E194ACD154A6}
{BEF15618-E03F-4A44-A797-9150C979B09F} = {F0F1B2A3-6924-4A09-99CE-D08CD8BCF392}
{60A07842-5D75-45E8-9FCF-C126E608B654} = {7B338049-F463-44B0-B7BD-F8EA16750085}
{DFDF94D9-2A0A-4F9B-953B-6BF383858AD3} = {4BC1549F-F4C2-42D0-9F77-C323F751EA04}
Expand Down
2 changes: 2 additions & 0 deletions build/nuget.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,7 @@
<add key="Local WinObjC Packages" value="..\tools\OutputPackages\Release\" />
<add key="Local WinObjC Packages - DEBUG" value="..\tools\OutputPackages\Debug\" />
<add key="Local prebuilts" value="..\deps\prebuilt\nuget\" />
<add key="Local WinObjC-Build Packages" value="OutputPackages\Release\" />
<add key="Local WinObjC-Build Packages - DEBUG" value="OutputPackages\Debug\" />
</packageSources>
</configuration>
3 changes: 0 additions & 3 deletions deps/prebuilt/Universal Windows/ARM/ObjCUWPMicrosoftAdvertising.dll
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions deps/prebuilt/Universal Windows/ARM/ObjCUWPMicrosoftAdvertising.lib
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions deps/prebuilt/Universal Windows/ARM/ObjCUWPWindowsApplicationModelAppExtensions.dll
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions deps/prebuilt/Universal Windows/ARM/ObjCUWPWindowsApplicationModelAppExtensions.lib
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions deps/prebuilt/Universal Windows/ARM/ObjCUWPWindowsApplicationModelAppService.dll
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions deps/prebuilt/Universal Windows/ARM/ObjCUWPWindowsApplicationModelAppService.lib
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions ...prebuilt/Universal Windows/ARM/ObjCUWPWindowsApplicationModelAppointmentsDataProvider.dll
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions ...prebuilt/Universal Windows/ARM/ObjCUWPWindowsApplicationModelAppointmentsDataProvider.lib
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions deps/prebuilt/Universal Windows/ARM/ObjCUWPWindowsApplicationModelCallsBackground.dll
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions deps/prebuilt/Universal Windows/ARM/ObjCUWPWindowsApplicationModelCallsBackground.lib
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions deps/prebuilt/Universal Windows/ARM/ObjCUWPWindowsApplicationModelCallsProvider.dll
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions deps/prebuilt/Universal Windows/ARM/ObjCUWPWindowsApplicationModelCallsProvider.lib
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions deps/prebuilt/Universal Windows/ARM/ObjCUWPWindowsApplicationModelChat.dll
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions deps/prebuilt/Universal Windows/ARM/ObjCUWPWindowsApplicationModelChat.lib
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions deps/prebuilt/Universal Windows/ARM/ObjCUWPWindowsApplicationModelCommunicationBlocking.dll
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions deps/prebuilt/Universal Windows/ARM/ObjCUWPWindowsApplicationModelCommunicationBlocking.lib
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions deps/prebuilt/Universal Windows/ARM/ObjCUWPWindowsApplicationModelContactsDataProvider.dll
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions deps/prebuilt/Universal Windows/ARM/ObjCUWPWindowsApplicationModelContactsDataProvider.lib
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions deps/prebuilt/Universal Windows/ARM/ObjCUWPWindowsApplicationModelDataTransfer.dll
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions deps/prebuilt/Universal Windows/ARM/ObjCUWPWindowsApplicationModelDataTransfer.lib
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions deps/prebuilt/Universal Windows/ARM/ObjCUWPWindowsApplicationModelDataTransferDragDrop.dll
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions deps/prebuilt/Universal Windows/ARM/ObjCUWPWindowsApplicationModelDataTransferDragDrop.lib
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions ...prebuilt/Universal Windows/ARM/ObjCUWPWindowsApplicationModelDataTransferDragDropCore.dll
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions ...prebuilt/Universal Windows/ARM/ObjCUWPWindowsApplicationModelDataTransferDragDropCore.lib
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions .../prebuilt/Universal Windows/ARM/ObjCUWPWindowsApplicationModelDataTransferShareTarget.dll
View file
Open in desktop

This file was deleted.

Loading