Skip to content

Commit 5340097

Browse files
authored
Feature: Removed FullTrustProcess (#10283)
1 parent ed9f1b3 commit 5340097

File tree

2,424 files changed

+1517
-5238
lines changed

Some content is hidden

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

2,424 files changed

+1517
-5238
lines changed

.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ BenchmarkDotNet.Artifacts/
5757
project.lock.json
5858
project.fragment.lock.json
5959
artifacts/
60-
**/Properties/launchSettings.json
6160

6261
# StyleCop
6362
StyleCopReport.xml
@@ -174,7 +173,6 @@ publish/
174173
*.azurePubxml
175174
# Note: Comment the next line if you want to checkin your web deploy settings,
176175
# but database connection strings (with potential passwords) will be unencrypted
177-
*.pubxml
178176
*.publishproj
179177

180178
# Microsoft Azure Web App publish settings. Comment the next line if you want to

Directory.Build.props

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

Files.sln

Lines changed: 186 additions & 202 deletions
Large diffs are not rendered by default.

builds/azure-pipelines-release.yml

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,12 @@ jobs:
5656
inputs:
5757
targetType: 'inline'
5858
script: |
59-
[xml]$xmlDoc = Get-Content $(Build.SourcesDirectory)\src\Files.Package\Package.appxmanifest
59+
[xml]$xmlDoc = Get-Content '$(Build.SourcesDirectory)\src\Files.App (Package)\Package.appxmanifest'
6060
$xmlDoc.Package.Identity.Name="${{parameters.packageIdentityName}}"
6161
$xmlDoc.Package.Identity.Publisher="Files"
6262
$xmlDoc.Package.Properties.DisplayName="${{parameters.packageDisplayName}}"
6363
$xmlDoc.Package.Applications.Application.VisualElements.DisplayName="${{parameters.packageDisplayName}}"
64-
$xmlDoc.Save('$(Build.SourcesDirectory)\src\Files.Package\Package.appxmanifest')
64+
$xmlDoc.Save('$(Build.SourcesDirectory)\src\Files.App (Package)\Package.appxmanifest')
6565
failOnStderr: true
6666

6767
# This replaces references to the dev icon with the specified icon variant
@@ -114,13 +114,13 @@ jobs:
114114
script: |
115115
for /f %%a in ('dir /b /a:d %localappdata%\Microsoft\VisualStudio\17*') do echo UsePreviews=True>%localappdata%\Microsoft\VisualStudio\%%a\sdk.txt
116116
117-
- task: NuGetToolInstaller@1
118-
119-
- task: NuGetCommand@2
117+
- task: MSBuild@1
120118
inputs:
121-
feedsToUse: config
122-
nugetConfigPath: nuget.config
123-
restoreSolution: '$(solution)'
119+
platform: 'x64'
120+
solution: '$(solution)'
121+
configuration: '$(sideloadBuildConfiguration)'
122+
msbuildArguments: '/t:restore /p:Configuration="$(sideloadBuildConfiguration)";Platform="$(buildPlatform)";PublishReadyToRun=true'
123+
maximumCpuCount: true
124124

125125
- task: DownloadSecureFile@1
126126
name: caCertificate
@@ -168,20 +168,18 @@ jobs:
168168
inputs:
169169
targetType: 'inline'
170170
script: |
171-
[xml]$xmlDoc = Get-Content $(Build.SourcesDirectory)\src\Files.Package\Package.appxmanifest
171+
[xml]$xmlDoc = Get-Content '$(Build.SourcesDirectory)\src\Files.App (Package)\Package.appxmanifest'
172172
$xmlDoc.Package.Identity.Name="49306atecsolution.FilesUWP"
173173
$xmlDoc.Package.Identity.Publisher="CN=53EC4384-7F5B-4CF6-8C23-513FFE9D1AB7"
174174
$xmlDoc.Package.Properties.DisplayName="Files"
175175
$xmlDoc.Package.Applications.Application.VisualElements.DisplayName="Files"
176-
177176
# Removes packageManagement from Store release
178177
$nsmgr = New-Object System.Xml.XmlNamespaceManager($xmlDoc.NameTable)
179178
$nsmgr.AddNamespace("pkg", "http://schemas.microsoft.com/appx/manifest/foundation/windows10")
180179
$nsmgr.AddNamespace("rescap", "http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities")
181180
$pm = $xmlDoc.SelectSingleNode("/pkg:Package/pkg:Capabilities/rescap:Capability[@Name='packageManagement']", $nsmgr)
182181
$xmlDoc.Package.Capabilities.RemoveChild($pm)
183-
184-
$xmlDoc.Save('$(Build.SourcesDirectory)\src\Files.Package\Package.appxmanifest')
182+
$xmlDoc.Save('$(Build.SourcesDirectory)\src\Files.App (Package)\Package.appxmanifest')
185183
failOnStderr: true
186184

187185
# This replaces references to the dev icon with the specified icon variant
@@ -234,13 +232,13 @@ jobs:
234232
script: |
235233
for /f %%a in ('dir /b /a:d %localappdata%\Microsoft\VisualStudio\17*') do echo UsePreviews=True>%localappdata%\Microsoft\VisualStudio\%%a\sdk.txt
236234
237-
- task: NuGetToolInstaller@1
238-
239-
- task: NuGetCommand@2
235+
- task: MSBuild@1
240236
inputs:
241-
feedsToUse: config
242-
nugetConfigPath: nuget.config
243-
restoreSolution: '$(solution)'
237+
platform: 'x64'
238+
solution: '$(solution)'
239+
configuration: '$(buildConfiguration)'
240+
msbuildArguments: '/t:restore /p:Configuration="$(buildConfiguration)";Platform="$(buildPlatform)";PublishReadyToRun=true'
241+
maximumCpuCount: true
244242

245243
- task: MSBuild@1
246244
inputs:
@@ -249,7 +247,7 @@ jobs:
249247
configuration: '$(buildConfiguration)'
250248
msbuildArguments: '/t:build;_GenerateAppxPackage /p:AppxBundlePlatforms="$(buildPlatform)" /p:AppxPackageDir="$(appxPackageDir)" /p:AppxBundle=Always /p:UapAppxPackageBuildMode=StoreUpload'
251249
maximumCpuCount: true
252-
250+
253251
- task: CopyFiles@2
254252
displayName: 'Copy Files to: $(build.artifactstagingdirectory)'
255253
inputs:
@@ -274,4 +272,4 @@ jobs:
274272
skipPolling: false
275273
deletePackages: true
276274
numberOfPackagesToKeep: '5'
277-
isMandatoryUpdate: true
275+
isMandatoryUpdate: true

builds/azure-pipelines.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ steps:
1515
inputs:
1616
targetType: 'inline'
1717
script: |
18-
[xml]$xmlDoc = Get-Content $(Build.SourcesDirectory)\src\Files.Package\Package.appxmanifest
18+
[xml]$xmlDoc = Get-Content '$(Build.SourcesDirectory)\src\Files.App (Package)\Package.appxmanifest'
1919
$xmlDoc.Package.Identity.Name="49306atecsolution.FilesUWP"
2020
$xmlDoc.Package.Identity.Publisher="CN=53EC4384-7F5B-4CF6-8C23-513FFE9D1AB7"
2121
$xmlDoc.Package.Properties.DisplayName="Files"
2222
$xmlDoc.Package.Applications.Application.VisualElements.DisplayName="Files"
23-
$xmlDoc.Save('$(Build.SourcesDirectory)\src\Files.Package\Package.appxmanifest')
23+
$xmlDoc.Save('$(Build.SourcesDirectory)\src\Files.App (Package)\Package.appxmanifest')
2424
failOnStderr: true
2525

2626
- task: PowerShell@2
@@ -70,13 +70,13 @@ steps:
7070
script: |
7171
for /f %%a in ('dir /b /a:d %localappdata%\Microsoft\VisualStudio\17*') do echo UsePreviews=True>%localappdata%\Microsoft\VisualStudio\%%a\sdk.txt
7272
73-
- task: NuGetToolInstaller@1
74-
75-
- task: NuGetCommand@2
73+
- task: MSBuild@1
7674
inputs:
77-
feedsToUse: config
78-
nugetConfigPath: nuget.config
79-
restoreSolution: '$(solution)'
75+
platform: 'x64'
76+
solution: '**/*.sln'
77+
configuration: '$(buildConfiguration)'
78+
msbuildArguments: '/t:restore /p:Configuration=Debug;Platform="$(buildPlatform)";PublishReadyToRun=true'
79+
maximumCpuCount: true
8080

8181
- task: MSBuild@1
8282
inputs:
@@ -117,7 +117,7 @@ steps:
117117
# inputs:
118118
# testSelector: 'testAssemblies'
119119
# testAssemblyVer2: |
120-
# **\$(buildConfiguration)\Files.InteractionTests\net6.0\Files.InteractionTests.dll
120+
# **\$(buildConfiguration)\Files.InteractionTests\net7.0\Files.InteractionTests.dll
121121
# !**\*TestAdapter.dll
122122
# !**\obj\**
123123
# searchFolder: '$(System.DefaultWorkingDirectory)'
@@ -132,4 +132,4 @@ steps:
132132
- task: PublishBuildArtifacts@1
133133
displayName: 'Publish Artifact: drop'
134134
inputs:
135-
PathtoPublish: '$(build.artifactstagingdirectory)'
135+
PathtoPublish: '$(build.artifactstagingdirectory)'

nuget.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
<configuration>
33
<packageSources>
44
<add key="NuGet official package source" value="https://api.nuget.org/v3/index.json" />
5-
<add key="Local Packages" value="src\Files.Package\nupkgs\" />
5+
<add key="Local Packages" value="src\Files.App\nupkgs\" />
66
</packageSources>
77
</configuration>
Lines changed: 4 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,82 +1,20 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFramework>net7.0-windows10.0.22000.0</TargetFramework>
4-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
6-
<Platforms>x86;x64;arm64</Platforms>
7-
<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
84
<AssemblyName>BackgroundTasks</AssemblyName>
95
<DefaultLanguage>en-US</DefaultLanguage>
106
<TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
117
<IsTrimmable>true</IsTrimmable>
8+
<Configurations>Debug;Release;Sideload</Configurations>
9+
<Platforms>x86;x64;ARM64</Platforms>
10+
<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
1211
</PropertyGroup>
1312
<PropertyGroup>
1413
<CsWinRTComponent>true</CsWinRTComponent>
1514
<CsWinRTWindowsMetadata>10.0.22000.0</CsWinRTWindowsMetadata>
1615
<CsWinRTGeneratedFilesDir>$(MSBuildProjectDirectory)\bin\$(Platform)\$(Configuration)</CsWinRTGeneratedFilesDir>
1716
</PropertyGroup>
1817
<ItemGroup>
19-
<PackageReference Include="Microsoft.Windows.CsWinRT">
20-
<Version>2.0.0</Version>
21-
</PackageReference>
18+
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.0.0" />
2219
</ItemGroup>
23-
<ItemGroup>
24-
<None Update="WinRT.Host.runtimeconfig.json">
25-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
26-
</None>
27-
</ItemGroup>
28-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
29-
<PlatformTarget>x86</PlatformTarget>
30-
<DefineConstants>DEBUG;TRACE;NETFX_CORE</DefineConstants>
31-
<NoWarn>;2008</NoWarn>
32-
<UseVSHostingProcess>false</UseVSHostingProcess>
33-
</PropertyGroup>
34-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
35-
<PlatformTarget>x86</PlatformTarget>
36-
<DefineConstants>TRACE;NETFX_CORE</DefineConstants>
37-
<NoWarn>;2008</NoWarn>
38-
<UseVSHostingProcess>false</UseVSHostingProcess>
39-
</PropertyGroup>
40-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|arm64'">
41-
<PlatformTarget>arm64</PlatformTarget>
42-
<DefineConstants>DEBUG;TRACE;NETFX_CORE</DefineConstants>
43-
<NoWarn>;2008</NoWarn>
44-
<UseVSHostingProcess>false</UseVSHostingProcess>
45-
</PropertyGroup>
46-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|arm64'">
47-
<PlatformTarget>arm64</PlatformTarget>
48-
<DefineConstants>TRACE;NETFX_CORE</DefineConstants>
49-
<NoWarn>;2008</NoWarn>
50-
<UseVSHostingProcess>false</UseVSHostingProcess>
51-
</PropertyGroup>
52-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
53-
<PlatformTarget>x64</PlatformTarget>
54-
<DefineConstants>DEBUG;TRACE;NETFX_CORE</DefineConstants>
55-
<NoWarn>;2008</NoWarn>
56-
<UseVSHostingProcess>false</UseVSHostingProcess>
57-
</PropertyGroup>
58-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
59-
<PlatformTarget>x64</PlatformTarget>
60-
<DefineConstants>TRACE;NETFX_CORE</DefineConstants>
61-
<NoWarn>;2008</NoWarn>
62-
<UseVSHostingProcess>false</UseVSHostingProcess>
63-
</PropertyGroup>
64-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Sideload|x86'">
65-
<DefineConstants>TRACE;NETFX_CORE</DefineConstants>
66-
<NoWarn>;2008</NoWarn>
67-
<PlatformTarget>x86</PlatformTarget>
68-
<UseVSHostingProcess>false</UseVSHostingProcess>
69-
</PropertyGroup>
70-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Sideload|arm64'">
71-
<DefineConstants>TRACE;NETFX_CORE</DefineConstants>
72-
<NoWarn>;2008</NoWarn>
73-
<PlatformTarget>arm64</PlatformTarget>
74-
<UseVSHostingProcess>false</UseVSHostingProcess>
75-
</PropertyGroup>
76-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Sideload|x64'">
77-
<DefineConstants>TRACE;NETFX_CORE</DefineConstants>
78-
<NoWarn>;2008</NoWarn>
79-
<PlatformTarget>x64</PlatformTarget>
80-
<UseVSHostingProcess>false</UseVSHostingProcess>
81-
</PropertyGroup>
8220
</Project>

src/BackgroundTasks/WinRT.Host.runtimeconfig.json

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

0 commit comments

Comments
 (0)