Skip to content

Commit 0be5366

Browse files
DrusTheAxeDrusTheAxe
authored
Strip experimental bits and references from 0.8 release (#932)
* Strip experimental bits and references from 0.8 release * Putting back a file into $NugetDir so see if 'no FullNuget dir' is the root problem * NugetDir doesn't exist since we dropped copying all the files into it? Let's try this...
1 parent 35a8f1b commit 0be5366

11 files changed

Lines changed: 1 addition & 205 deletions

‎build/AzurePipelinesTemplates/ProjectReunion-BuildProject-Steps.yml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -95,17 +95,6 @@ steps:
9595
arguments: -CheckTAEFService -Offline -Verbose
9696
workingDirectory: '$(Build.SourcesDirectory)'
9797
98-
#DISABLED - GitHub runs as a a built-in Administrator (thus Elevated and no split-token)
99-
# TAEF Service can't RunAs:RestrictedUser from this account thus all tests Failed or Blocked
100-
# and Dynamic Dependencies doesn't support Elevation so it's impossible for this test to
101-
# work correctly today. Disabling until we move off GitHub's pipeline for test execution
102-
# - task: CmdLine@2
103-
# displayName: 'Run AppLifeCycleTest'
104-
# inputs:
105-
# script: 'te.exe CppTest.dll'
106-
# workingDirectory: '$(Build.SourcesDirectory)\BuildOutput\$(buildConfiguration)\$(buildPlatform)\CppTest'
107-
# condition: or(eq(variables.buildPlatform, 'x64'), eq(variables.buildPlatform, 'x86'))
108-
10998
- task: PublishBuildArtifacts@1
11099
displayName: 'Publish ${{ parameters.solutionPath }} binlog'
111100
condition: succeededOrFailed()

‎build/AzurePipelinesTemplates/ProjectReunion-CreateNugetPackage-Job.yml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,16 +54,11 @@ jobs:
5454
Copy-Item -Path "$targetsFilePath\ProjectReunion-Nuget-Native.targets" -Destination "$fullpackagePath\build\native\Microsoft.ProjectReunion.Foundation.targets"
5555
Copy-Item -Path "$targetsFilePath\ProjectReunion-Nuget-Native.props" -Destination "$fullpackagePath\build\native\Microsoft.ProjectReunion.Foundation.props"
5656
Copy-Item -Path "$targetsFilePath\ProjectReunion-Nuget-Native.C.props" -Destination "$fullpackagePath\build\native\ProjectReunion-Nuget-Native.C.props"
57-
Copy-Item -Path "$targetsFilePath\ProjectReunion-Nuget-Native.WinRt.props" -Destination "$fullpackagePath\build\native\ProjectReunion-Nuget-Native.WinRt.props"
5857
Copy-Item -Path "$targetsFilePath\Microsoft.ProjectReunion.Foundation.targets" -Destination "$fullpackagePath\build\Microsoft.ProjectReunion.Foundation.targets"
5958
Copy-Item -Path "$targetsFilePath\Microsoft.ProjectReunion.Foundation.props" -Destination "$fullpackagePath\build\Microsoft.ProjectReunion.Foundation.props"
60-
Copy-Item -Path "$targetsFilePath\Microsoft.ProjectReunion.Bootstrap.targets" -Destination "$fullpackagePath\build\Microsoft.ProjectReunion.Bootstrap.targets"
6159
6260
Copy-Item -Path "$targetsFilePath\AppxManifest.xml" -Destination "$fullpackagePath\AppxManifest.xml"
6361
64-
Copy-Item -Path "$targetsFilePath\Intellisense\Microsoft.Windows.AppLifecycle.xml" -Destination "$fullpackagePath\lib\uap10.0\Microsoft.Windows.AppLifecycle.xml"
65-
Copy-Item -Path "$targetsFilePath\Intellisense\Microsoft.Windows.ApplicationModel.DynamicDependency.xml" -Destination "$fullpackagePath\lib\uap10.0\Microsoft.Windows.ApplicationModel.DynamicDependency.xml"
66-
6762
# - script: |
6863
# dir /s $(Build.SourcesDirectory)
6964

‎build/CopyFilesToStagingDir.ps1‎

Lines changed: 1 addition & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ $FullBuildOutput = "$($BuildOutputDir)\$($Configuration)\$($Platform)"
1313
$FullPublishDir = "$($PublishDir)\$($Configuration)\$($Platform)"
1414

1515
if (!(Test-Path $FullPublishDir)) { mkdir $FullPublishDir }
16-
16+
if (!(Test-Path $NugetDir)) { mkdir $NugetDir }
1717

1818
function PublishFile {
1919
Param($source, $destinationDir, [switch]$IfExists = $false)
@@ -35,93 +35,9 @@ function PublishFile {
3535

3636
PublishFile $OverrideDir\DynamicDependency-Override.json $FullPublishDir\
3737

38-
PublishFile $FullBuildOutput\ProjectReunion_DLL\Microsoft.ProjectReunion.dll $FullPublishDir\Microsoft.ProjectReunion\
39-
PublishFile $FullBuildOutput\ProjectReunion_DLL\Microsoft.ProjectReunion.lib $FullPublishDir\Microsoft.ProjectReunion\
40-
PublishFile $FullBuildOutput\ProjectReunion_DLL\Microsoft.Windows.AppLifecycle.winmd $FullPublishDir\Microsoft.ProjectReunion\
41-
PublishFile $FullBuildOutput\ProjectReunion_DLL\Microsoft.Windows.ApplicationModel.DynamicDependency.winmd $FullPublishDir\Microsoft.ProjectReunion\
42-
PublishFile $FullBuildOutput\ProjectReunion_DLL\MsixDynamicDependency.h $FullPublishDir\Microsoft.ProjectReunion\
43-
PublishFile $FullBuildOutput\ProjectReunion_DLL\wil_msixdynamicdependency.h $FullPublishDir\Microsoft.ProjectReunion\
44-
#
45-
PublishFile $FullBuildOutput\DynamicDependency.DataStore\DynamicDependency.DataStore.exe $FullPublishDir\DynamicDependency.DataStore\
46-
PublishFile $FullBuildOutput\DynamicDependency.DataStore.ProxyStub\DynamicDependency.DataStore.ProxyStub.dll $FullPublishDir\DynamicDependency.DataStore\
47-
#
48-
PublishFile $FullBuildOutput\DynamicDependencyLifetimeManager\DynamicDependencyLifetimeManager.exe $FullPublishDir\DynamicDependencyLifetimeManager\
49-
PublishFile $FullBuildOutput\DynamicDependencyLifetimeManager.ProxyStub\DynamicDependencyLifetimeManager.ProxyStub.dll $FullPublishDir\DynamicDependencyLifetimeManager\
50-
#
51-
PublishFile $FullBuildOutput\ProjectReunion_BootstrapDLL\Microsoft.ProjectReunion.Bootstrap.dll $FullPublishDir\Microsoft.ProjectReunion.Bootstrap\
52-
PublishFile $FullBuildOutput\ProjectReunion_BootstrapDLL\Microsoft.ProjectReunion.Bootstrap.lib $FullPublishDir\Microsoft.ProjectReunion.Bootstrap\
53-
PublishFile $FullBuildOutput\ProjectReunion_BootstrapDLL\MddBootstrap.h $FullPublishDir\Microsoft.ProjectReunion.Bootstrap\
54-
55-
#PublishFile -IfExists $FullBuildOutput\ProjectReunion_DLL\Generic.xaml $FullPublishDir\Microsoft.ProjectReunion\
56-
#PublishFile -IfExists $FullBuildOutput\Microsoft.ProjectReunion.Design\Microsoft.ProjectReunion.Design.dll $FullPublishDir\Microsoft.ProjectReunion.Design\
57-
#PublishFile -IfExists $BuildOutputDir\$Configuration\AnyCPU\Microsoft.ProjectReunion.FrameworkPackagePRI\Microsoft.ProjectReunion.pri $FullPublishDir\Microsoft.ProjectReunion.FrameworkPackagePRI\
58-
59-
#UNDONE - PGO etc. later PR
60-
# pgosweep and vcruntime are required to run pgo instrumented test run. They are placed from the
61-
# cx test app instead of releasetest.dll since these are architecture specific and the ReleaseTest assembly is AnyCPU.
62-
#PublishFile -IfExists $FullBuildOutput\NugetPackageTestAppCX\pgosweep.exe $FullPublishDir\Test\
63-
#PublishFile -IfExists $FullBuildOutput\NugetPackageTestAppCX\vcruntime140.dll $FullPublishDir\Test\
64-
6538
PublishFile -IfExists $FullBuildOutput\FrameworkPackage\*.* $FullPublishDir\FrameworkPackage
6639

6740
if($PublishAppxFiles)
6841
{
6942
$AppxPackagesDir = "$FullPublishDir\AppxPackages"
70-
71-
# PublishFile -IfExists $FullBuildOutput\MUXControlsTestApp.TAEF\AppPackages\MUXControlsTestApp_Test\ $AppxPackagesDir
72-
# PublishFile -IfExists $FullBuildOutput\IXMPTestApp.TAEF\AppPackages\IXMPTestApp_Test\ $AppxPackagesDir
73-
# PublishFile -IfExists $FullBuildOutput\MUXControlsTestAppWPFPackage\AppPackages\MUXControlsTestAppWPFPackage_Test\ $AppxPackagesDir
74-
75-
# PublishFile -IfExists $FullBuildOutput\NugetPackageTestApp\AppPackages\NugetPackageTestApp_Test\ $AppxPackagesDir
76-
# PublishFile -IfExists $FullBuildOutput\NugetPackageTestAppCX\AppPackages\NugetPackageTestAppCX_Test\ $AppxPackagesDir
77-
# PublishFile -IfExists $FullBuildOutput\AppThatUsesMUXIndirectly\AppPackages\AppThatUsesMUXIndirectly_Test\ $AppxPackagesDir
7843
}
79-
80-
# Publish pdbs:
81-
$symbolsOutputDir = "$($FullPublishDir)\Symbols\"
82-
PublishFile $FullBuildOutput\ProjectReunion_DLL\Microsoft.ProjectReunion.pdb $symbolsOutputDir
83-
PublishFile $FullBuildOutput\DynamicDependency.DataStore\DynamicDependency.DataStore.pdb $symbolsOutputDir
84-
PublishFile $FullBuildOutput\DynamicDependencyLifetimeManager\DynamicDependencyLifetimeManager.pdb $symbolsOutputDir
85-
PublishFile $FullBuildOutput\ProjectReunion_BootstrapDLL\Microsoft.ProjectReunion.Bootstrap.pdb $symbolsOutputDir
86-
PublishFile $FullBuildOutput\ProjectReunion_BootstrapDLL\Microsoft.ProjectReunion.Bootstrap.pdb $symbolsOutputDir
87-
88-
# Copy files to Full Nuget package
89-
#
90-
# Includes (*.h)
91-
PublishFile $FullBuildOutput\ProjectReunion_BootstrapDLL\MddBootstrap.h $NugetDir\include
92-
PublishFile $FullBuildOutput\ProjectReunion_DLL\MsixDynamicDependency.h $NugetDir\include
93-
PublishFile $FullBuildOutput\ProjectReunion_DLL\wil_msixdynamicdependency.h $NugetDir\include
94-
#
95-
# Libraries (*.lib)
96-
PublishFile $FullBuildOutput\ProjectReunion_BootstrapDLL\Microsoft.ProjectReunion.Bootstrap.lib $NugetDir\lib\win10-$Platform
97-
PublishFile $FullBuildOutput\ProjectReunion_DLL\Microsoft.ProjectReunion.lib $NugetDir\lib\win10-$Platform
98-
#
99-
# MSIX Framework package - DLLs
100-
PublishFile $FullBuildOutput\ProjectReunion_DLL\Microsoft.ProjectReunion.dll $NugetDir\runtimes\win10-$Platform\native
101-
PublishFile $FullBuildOutput\ProjectReunion_DLL\Microsoft.ProjectReunion.pdb $NugetDir\runtimes\win10-$Platform\native
102-
#
103-
# MSIX Main package
104-
PublishFile $FullBuildOutput\DynamicDependency.DataStore\DynamicDependency.DataStore.exe $NugetDir\runtimes\win10-$Platform\native
105-
PublishFile $FullBuildOutput\DynamicDependency.DataStore\DynamicDependency.DataStore.pdb $NugetDir\runtimes\win10-$Platform\native
106-
PublishFile $FullBuildOutput\DynamicDependency.DataStore.ProxyStub\DynamicDependency.DataStore.ProxyStub.dll $NugetDir\runtimes\win10-$Platform\native
107-
PublishFile $FullBuildOutput\DynamicDependency.DataStore.ProxyStub\DynamicDependency.DataStore.ProxyStub.pdb $NugetDir\runtimes\win10-$Platform\native
108-
#
109-
# MSIX DDLM package
110-
PublishFile $FullBuildOutput\DynamicDependencyLifetimeManager\DynamicDependencyLifetimeManager.exe $NugetDir\runtimes\win10-$Platform\native
111-
PublishFile $FullBuildOutput\DynamicDependencyLifetimeManager\DynamicDependencyLifetimeManager.pdb $NugetDir\runtimes\win10-$Platform\native
112-
PublishFile $FullBuildOutput\DynamicDependencyLifetimeManager.ProxyStub\DynamicDependencyLifetimeManager.ProxyStub.dll $NugetDir\runtimes\win10-$Platform\native
113-
PublishFile $FullBuildOutput\DynamicDependencyLifetimeManager.ProxyStub\DynamicDependencyLifetimeManager.ProxyStub.pdb $NugetDir\runtimes\win10-$Platform\native
114-
#
115-
# WinMD for UWP apps
116-
PublishFile $FullBuildOutput\ProjectReunion_DLL\Microsoft.Windows.AppLifecycle.winmd $NugetDir\lib\uap10.0
117-
#
118-
# Native (not managed, no MSIX)
119-
PublishFile $FullBuildOutput\ProjectReunion_BootstrapDLL\Microsoft.ProjectReunion.Bootstrap.dll $NugetDir\runtimes\lib\native\$Platform
120-
PublishFile $FullBuildOutput\ProjectReunion_BootstrapDLL\Microsoft.ProjectReunion.Bootstrap.pdb $NugetDir\runtimes\lib\native\$Platform
121-
PublishFile $FullBuildOutput\ProjectReunion_DLL\Microsoft.Windows.AppLifecycle.winmd $NugetDir\lib\native
122-
PublishFile $FullBuildOutput\ProjectReunion_DLL\Microsoft.Windows.ApplicationModel.DynamicDependency.winmd $NugetDir\lib\native
123-
#
124-
# C#/WinRT Projections
125-
#
126-
# Dynamic Dependency build overrides
127-
PublishFile $OverrideDir\DynamicDependency-Override.json $NugetDir\runtimes\win10-$Platform\native

‎build/NuSpecs/AppxManifest.xml‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,5 @@
2424
<ActivatableClass ActivatableClassId="Microsoft.ApplicationModel.Resources.ResourceManager" ThreadingModel="both" />
2525
</InProcessServer>
2626
</Extension>
27-
<Extension Category="windows.activatableClass.inProcessServer">
28-
<InProcessServer>
29-
<Path>Microsoft.ProjectReunion.dll</Path>
30-
<!-- Dynamic Dependency -->
31-
<ActivatableClass ActivatableClassId="Microsoft.Windows.ApplicationModel.DynamicDependency.AddPackageDependencyOptions" ThreadingModel="both" />
32-
<ActivatableClass ActivatableClassId="Microsoft.Windows.ApplicationModel.DynamicDependency.CreatePackageDependencyOptions" ThreadingModel="both" />
33-
<ActivatableClass ActivatableClassId="Microsoft.Windows.ApplicationModel.DynamicDependency.PackageDependency" ThreadingModel="both" />
34-
<ActivatableClass ActivatableClassId="Microsoft.Windows.ApplicationModel.DynamicDependency.PackageDependencyContext" ThreadingModel="both" />
35-
<ActivatableClass ActivatableClassId="Microsoft.Windows.ApplicationModel.DynamicDependency.PackageDependencyRank" ThreadingModel="both" />
36-
37-
<!-- AppLifecycle -->
38-
<ActivatableClass ActivatableClassId="Microsoft.Windows.AppLifecycle.ActivationRegistrationManager" ThreadingModel="both" />
39-
<ActivatableClass ActivatableClassId="Microsoft.Windows.AppLifecycle.AppInstance" ThreadingModel="both" />
40-
</InProcessServer>
41-
</Extension>
4227
</Extensions>
4328
</Package>

‎build/NuSpecs/Microsoft.ProjectReunion.Bootstrap.targets‎

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

‎build/NuSpecs/Microsoft.ProjectReunion.Foundation.targets‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
33
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
44
<Import Project="$(MSBuildThisFileDirectory)Microsoft.ApplicationModel.Resources.targets" />
5-
<Import Project="$(MSBuildThisFileDirectory)Microsoft.ProjectReunion.Bootstrap.targets" Condition="'$(MSBuildProjectExtension)' != '.wapproj'" />
65

76
<ItemGroup>
87
<ProjectCapability Include="ProjectReunion" />

‎build/NuSpecs/ProjectReunion-Nuget-Native.C.props‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,10 @@
11
<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33

4-
<PropertyGroup>
5-
<_ProjectReunionFoundationPlatform Condition="'$(Platform)' == 'Win32'">x86</_ProjectReunionFoundationPlatform>
6-
<_ProjectReunionFoundationPlatform Condition="'$(Platform)' != 'Win32'">$(Platform)</_ProjectReunionFoundationPlatform>
7-
</PropertyGroup>
8-
94
<ItemDefinitionGroup>
105
<ClCompile>
116
<AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
127
</ClCompile>
138
</ItemDefinitionGroup>
149

15-
<ItemDefinitionGroup>
16-
<Link>
17-
<AdditionalDependencies>
18-
$(MSBuildThisFileDirectory)..\..\lib\win10-$(_ProjectReunionFoundationPlatform)\Microsoft.ProjectReunion.lib;
19-
%(AdditionalDependencies);
20-
</AdditionalDependencies>
21-
</Link>
22-
</ItemDefinitionGroup>
23-
24-
<ItemDefinitionGroup Condition="'$(AppxPackage)' != 'true'">
25-
<Link>
26-
<AdditionalDependencies>
27-
$(MSBuildThisFileDirectory)..\..\lib\win10-$(_ProjectReunionFoundationPlatform)\Microsoft.ProjectReunion.Bootstrap.lib;
28-
%(AdditionalDependencies);
29-
</AdditionalDependencies>
30-
</Link>
31-
<PostBuildEvent>
32-
<Command>xcopy /y "$(MSBuildThisFileDirectory)..\..\runtimes\lib\native\$(_ProjectReunionFoundationPlatform)\Microsoft.ProjectReunion.Bootstrap.dll" "$(OutDir)"</Command>
33-
</PostBuildEvent>
34-
</ItemDefinitionGroup>
35-
3610
</Project>

‎build/NuSpecs/ProjectReunion-Nuget-Native.WinRt.props‎

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

‎build/NuSpecs/ProjectReunion-Nuget-Native.props‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@
22
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildThisFileDirectory)Microsoft.ApplicationModel.Resources.props"/>
44
<Import Project="$(MSBuildThisFileDirectory)ProjectReunion-Nuget-Native.C.props" />
5-
<Import Project="$(MSBuildThisFileDirectory)ProjectReunion-Nuget-Native.WinRt.props" />
65
</Project>

‎build/NuSpecs/ProjectReunion-Nuget-Native.targets‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,4 @@
44

55
<Import Project="$(MSBuildThisFileDirectory)Microsoft.ApplicationModel.Resources.targets"/>
66

7-
<PropertyGroup>
8-
<Native-Platform Condition="'$(Platform)' == 'Win32'">x86</Native-Platform>
9-
<Native-Platform Condition="'$(Platform)' != 'Win32'">$(Platform)</Native-Platform>
10-
</PropertyGroup>
11-
12-
<ItemGroup Condition="'$(AppxPackage)' != 'true'">
13-
<Reference Include="$(MSBuildThisFileDirectory)..\..\lib\native\Microsoft.Windows.ApplicationModel.DynamicDependency.winmd">
14-
<Private>false</Private>
15-
<Implementation>Microsoft.ProjectReunion.dll</Implementation>
16-
</Reference>
17-
</ItemGroup>
18-
19-
<ItemGroup>
20-
<Reference Include="$(MSBuildThisFileDirectory)..\..\lib\native\Microsoft.Windows.AppLifecycle.winmd">
21-
<Private>false</Private>
22-
<Implementation>Microsoft.ProjectReunion.dll</Implementation>
23-
</Reference>
24-
</ItemGroup>
25-
267
</Project>

0 commit comments

Comments
 (0)