Skip to content

Update assembly version from hardcoded to MajorVersion and update NetCoreAppCurrent to net8.0 #78354

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ViktorHofer merged 47 commits into from
Dec 5, 2022
Merged

Update assembly version from hardcoded to MajorVersion and update NetCoreAppCurrent to net8.0 #78354

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
17764b9
Update assembly version from hardcoded to MajorVersion
carlossanlop Nov 15, 2022
04be22b
Adjust Microsoft.VisualBasic.Core
carlossanlop Nov 15, 2022
e1ab7c4
Adjust System.Diagnostics.EventLog
carlossanlop Nov 15, 2022
b74da6d
Adjust System.Resources.Extensions
carlossanlop Nov 15, 2022
498421e
Adjust System.Runtime.Serialization.Xml
carlossanlop Nov 15, 2022
7b33ff9
Extract the LocalEchoServer bits from the projects so that the helix …
carlossanlop Nov 15, 2022
1091cec
Build the LocalEchoServers specifically without using artifacts
carlossanlop Nov 15, 2022
2a40f98
Add missing files
carlossanlop Nov 15, 2022
39e41c8
Use eng/targetingpacks.targets instead of wasm specific targets
carlossanlop Nov 15, 2022
bda1ada
Avoid duplicate imports, and don't use the targetingpacks.targets for…
carlossanlop Nov 15, 2022
406dc14
Update NetCoreAppCurrent to net8.0 and NetCoreAppPrevious
ViktorHofer Nov 16, 2022
057c3f8
Add NetCoreAppPrevious tfm to out-of-band projects
ViktorHofer Nov 16, 2022
7a24341
Update reference source projects with new tfm
ViktorHofer Nov 18, 2022
7b27686
Set maximum version early enough for SDK features
ViktorHofer Nov 18, 2022
da173cc
Update suppression files for tfm change
ViktorHofer Nov 18, 2022
28fa14d
Merge remote-tracking branch 'origin/main' into Net8ChangesSecondAttempt
ViktorHofer Nov 18, 2022
ba30472
Fix libraries build because of ILLink warning
ViktorHofer Nov 18, 2022
46780fd
Update 'net7.0' usages in the repo
ViktorHofer Nov 18, 2022
fa358ce
Update ymls
ViktorHofer Nov 18, 2022
1068c54
Make trimming tests use the live built apphost
ViktorHofer Nov 21, 2022
51ecadc
Add trimmingTests.props
ViktorHofer Nov 21, 2022
2206104
UseLiveAppHost
ViktorHofer Nov 21, 2022
5274dc5
Merge remote-tracking branch 'upstream/main' into Net8ChangesSecondAt…
ViktorHofer Nov 22, 2022
94e88d9
Clean-up shared CoreLib suppression file
ViktorHofer Nov 22, 2022
eaff756
Live apphost issues with NativeExports
ViktorHofer Nov 25, 2022
b0c8d0b
Merge branch 'main' into Net8ChangesSecondAttempt
ViktorHofer Nov 29, 2022
8f156e4
Merge branch 'main' into Net8ChangesSecondAttempt
ViktorHofer Dec 1, 2022
00c3911
Update hardcoded tfm values in wasm build files
ViktorHofer Dec 1, 2022
556b2cb
Remove explicit TF specification from JIT test
agocke Dec 1, 2022
a2bf701
[wasm] Fix debugger tests to run with net8.0
radical Dec 1, 2022
d343750
Merge branch 'Net8ChangesSecondAttempt' of https://github.com/carloss…
radical Dec 1, 2022
338b4c3
[wasi] Sample: change net7.0 -> net8.0
radical Dec 1, 2022
79c28de
add comment
radical Dec 1, 2022
7194ec3
Don't try to restore 8.0 ILC with 7.0 SDK
sbomer Dec 2, 2022
03ee362
Add missing file
radical Dec 2, 2022
5435aa8
Add KnownILCompilerPack entry to targetingpacks.targets
ViktorHofer Dec 2, 2022
739493d
Merge remote-tracking branch 'origin/main' into Net8ChangesSecondAttempt
ViktorHofer Dec 2, 2022
cfad266
Fix Hashing API only available in ref/Hashing net8.0.
ViktorHofer Dec 2, 2022
2e136ad
Fix APICompat issue
ViktorHofer Dec 2, 2022
70a3755
Fix more apicompat issues
ViktorHofer Dec 2, 2022
9d808ba
Specify host configuration when building the host in yml
ViktorHofer Dec 2, 2022
d24dea5
Update AppleApp local build NetCoreAppCurrent
ViktorHofer Dec 2, 2022
2a815b2
Fix S.S.Permissions apicompat suppression file
ViktorHofer Dec 2, 2022
ee2300e
Hack support for net8.0 tfm in installer tests
ViktorHofer Dec 2, 2022
83279ca
Allow NativeExports to use a prebuilt apphost
ViktorHofer Dec 4, 2022
adcc6c8
UseLocalAppHostPack property
ViktorHofer Dec 4, 2022
8907d92
Fix apphostsourcepath in DNNE project
ViktorHofer Dec 5, 2022
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
Prev Previous commit
Next Next commit
Extract the LocalEchoServer bits from the projects so that the helix … 
…bits are in a LocalEchoServer.helix.targets, instead of being special-cased in sendtohelix-wasm.targets. And this is setup and used by the test projects by importing one file.
  • Loading branch information
@carlossanlop @ViktorHofer
carlossanlop authored and ViktorHofer committed Nov 16, 2022
commit 7b33ff952507899ac928efcc31f52a9a471932bb
17 changes: 17 additions & 0 deletions src/libraries/Common/tests/System/Net/Prerequisites/LocalEchoServer.helix.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<Project>
<PropertyGroup Condition="'$(IsRunningLibraryTests)' == 'true' and
('$(Scenario)' == '' or '$(Scenario)' == 'normal' or
'$(Scenario)' == 'WasmTestOnBrowser' or '$(Scenario)' == 'WasmTestOnNodeJS')">

<HelixExtensionTargets>$(HelixExtensionTargets);_AddMiddlewarePayload</HelixExtensionTargets>
<TestEchoMiddleware>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'bin', 'NetCoreServer', '$(Configuration)', '$(AspNetCoreAppCurrent)'))</TestEchoMiddleware>
<RemoteLoopMiddleware>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'bin', 'RemoteLoopServer', '$(Configuration)', '$(AspNetCoreAppCurrent)'))</RemoteLoopMiddleware>
</PropertyGroup>

<Target Name="_AddMiddlewarePayload">
<ItemGroup>
<HelixCorrelationPayload Include="$(TestEchoMiddleware)" Destination="xharness/TestEchoMiddleware" Condition="Exists('$(TestEchoMiddleware)')" />
<HelixCorrelationPayload Include="$(RemoteLoopMiddleware)" Destination="xharness/RemoteLoopMiddleware" Condition="Exists('$(RemoteLoopMiddleware)')" />
</ItemGroup>
</Target>
</Project>
22 changes: 22 additions & 0 deletions src/libraries/Common/tests/System/Net/Prerequisites/LocalEchoServer.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<Project>
<PropertyGroup Condition="'$(TargetOS)' == 'Browser'">
<_TargetFrameworkForXHarness>$(AspNetCoreAppCurrent)</_TargetFrameworkForXHarness>
<HelixTargetsFile>$(MSBuildThisFileDirectory)LocalEchoServer.helix.targets</HelixTargetsFile>

<!-- handle different path to middleware in Helix -->
<_TestEchoMiddleware Condition="'$(ContinuousIntegrationBuild)' == 'true' and '$(OS)' == 'Windows_NT'">%HELIX_CORRELATION_PAYLOAD%/xharness/TestEchoMiddleware</_TestEchoMiddleware>
<_TestEchoMiddleware Condition="'$(ContinuousIntegrationBuild)' == 'true' and '$(OS)' != 'Windows_NT'">$HELIX_CORRELATION_PAYLOAD/xharness/TestEchoMiddleware</_TestEchoMiddleware>
Expand All @@ -15,6 +18,25 @@
<WasmXHarnessArgs>$(WasmXHarnessArgs) --web-server-middleware=$(_RemoteLoopMiddleware)/RemoteLoopServer.dll,RemoteLoopServer.GenericHandler</WasmXHarnessArgs>
<WasmXHarnessArgs>$(WasmXHarnessArgs) --web-server-middleware=$(_TestEchoMiddleware)/NetCoreServer.dll,NetCoreServer.GenericHandler</WasmXHarnessArgs>
</PropertyGroup>

<ItemGroup Condition="'$(TargetOS)' == 'Browser'">
<!-- The middleware doesn't need to be built for browser-wasm, so remove the relevant properties.
Also, due to https://github.com/dotnet/runtime/issues/77707 RunAOTCompilation needs to be removed
as a workaround. -->
<ProjectReference
Include="$(CommonTestPath)System/Net/Prerequisites/NetCoreServer/NetCoreServer.csproj"
GlobalPropertiesToRemove="TargetOS;TargetArchitecture;RuntimeIdentifier;RunAOTCompilation"
AdditionalProperties="_TargetFrameworkForXHarness=$(_TargetFrameworkForXHarness);NewtonsoftJsonVersion=$(NewtonsoftJsonVersion)"
ReferenceOutputAssembly="false"/>
<ProjectReference
Include="$(CommonTestPath)System/Net/Prerequisites/RemoteLoopServer/RemoteLoopServer.csproj"
GlobalPropertiesToRemove="TargetOS;TargetArchitecture;RuntimeIdentifier;RunAOTCompilation"
AdditionalProperties="_TargetFrameworkForXHarness=$(_TargetFrameworkForXHarness)"
ReferenceOutputAssembly="false"/>
<Compile Include="$(CommonTestPath)System\Net\WebSockets\WebSocketStream.cs"
Link="Common\System\Net\WebSockets\WebSocketStream.cs" />
</ItemGroup>


<!-- Tests use self-signed certificates that are refused by NodeJS -->
<Target Name="AcceptUnauthorizedOnNodeJS" BeforeTargets="GenerateRunScript">
Expand Down
12 changes: 2 additions & 10 deletions src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Condition="'$(TargetOS)' == 'Browser'" Project="$(CommonTestPath)System/Net/Prerequisites/LocalEchoServer.props" />

<PropertyGroup>
<StringResourcesPath>../../src/Resources/Strings.resx</StringResourcesPath>
<DefineConstants>$(DefineConstants);SYSNETHTTP_NO_OPENSSL;HTTP3</DefineConstants>
Expand Down Expand Up @@ -38,16 +40,6 @@
<TrimmerRootDescriptor Include="$(MSBuildThisFileDirectory)ILLink.Descriptor.xml" Condition="'$(TargetOS)' == 'Browser'" />
</ItemGroup>

<Import Condition="'$(TargetOS)' == 'Browser'" Project="$(CommonTestPath)System/Net/Prerequisites/LocalEchoServer.props" />

<!-- Browser specific files -->
<ItemGroup Condition="'$(TargetOS)' == 'Browser'">
<ProjectReference Include="$(CommonTestPath)System/Net/Prerequisites/NetCoreServer/NetCoreServer.csproj" ReferenceOutputAssembly="false"/>
<ProjectReference Include="$(CommonTestPath)System/Net/Prerequisites/RemoteLoopServer/RemoteLoopServer.csproj" ReferenceOutputAssembly="false"/>
<Compile Include="$(CommonTestPath)System\Net\WebSockets\WebSocketStream.cs"
Link="Common\System\Net\WebSockets\WebSocketStream.cs" />
</ItemGroup>

<ItemGroup>
<Compile Include="$(CommonPath)DisableRuntimeMarshalling.cs"
Link="Common\DisableRuntimeMarshalling.cs" />
Expand Down
11 changes: 2 additions & 9 deletions src/libraries/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Condition="'$(TargetOS)' == 'Browser'" Project="$(CommonTestPath)System/Net/Prerequisites/LocalEchoServer.props" />

<PropertyGroup>
<StringResourcesPath>../src/Resources/Strings.resx</StringResourcesPath>
<TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppCurrent)-Browser</TargetFrameworks>
Expand All @@ -17,22 +19,13 @@
<DefineConstants>$(DefineConstants);TARGET_BROWSER</DefineConstants>
</PropertyGroup>

<Import Condition="'$(TargetOS)' == 'Browser'" Project="$(CommonTestPath)System/Net/Prerequisites/LocalEchoServer.props" />

<ItemGroup>
<WasmExtraFilesToDeploy Include="package.json" />
<WasmExtraFilesToDeploy Include="package-lock.json" />

<NodeNpmModule Include="ws" Alias="WebSocket" />
</ItemGroup>

<!-- Browser specific files -->
<ItemGroup Condition="'$(TargetOS)' == 'Browser'">
<ProjectReference Include="$(CommonTestPath)System/Net/Prerequisites/NetCoreServer/NetCoreServer.csproj" ReferenceOutputAssembly="false" />
<ProjectReference Include="$(CommonTestPath)System/Net/Prerequisites/RemoteLoopServer/RemoteLoopServer.csproj" ReferenceOutputAssembly="false" />
<Compile Include="$(CommonTestPath)System\Net\WebSockets\WebSocketStream.cs" Link="Common\System\Net\WebSockets\WebSocketStream.cs" />
</ItemGroup>

<!-- Do not reference these assemblies from the TargetingPack since we are building part of the source code for tests. -->
<ItemGroup>
<DefaultReferenceExclusion Include="System.Configuration" />
Expand Down
12 changes: 2 additions & 10 deletions ...es/System.Net.WebSockets.Client/tests/wasm/System.Net.WebSockets.Client.Wasm.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Condition="'$(TargetOS)' == 'Browser'" Project="$(CommonTestPath)System/Net/Prerequisites/LocalEchoServer.props" />

<PropertyGroup>
<StringResourcesPath>../../src/Resources/Strings.resx</StringResourcesPath>
<TargetFramework>$(NetCoreAppCurrent)-Browser</TargetFramework>
Expand All @@ -13,16 +15,6 @@
<DefineConstants>$(DefineConstants);TARGET_BROWSER</DefineConstants>
</PropertyGroup>

<Import Condition="'$(TargetOS)' == 'Browser'" Project="$(CommonTestPath)System/Net/Prerequisites/LocalEchoServer.props" />

<!-- Browser specific files -->
<ItemGroup Condition="'$(TargetOS)' == 'Browser'">
<ProjectReference Include="$(CommonTestPath)System/Net/Prerequisites/NetCoreServer/NetCoreServer.csproj" ReferenceOutputAssembly="false"/>
<ProjectReference Include="$(CommonTestPath)System/Net/Prerequisites/RemoteLoopServer/RemoteLoopServer.csproj" ReferenceOutputAssembly="false"/>
<Compile Include="$(CommonTestPath)System\Net\WebSockets\WebSocketStream.cs"
Link="Common\System\Net\WebSockets\WebSocketStream.cs" />
</ItemGroup>

<!-- Do not reference these assemblies from the TargetingPack since we are building part of the source code for tests. -->
<ItemGroup>
<DefaultReferenceExclusion Include="System.Configuration" />
Expand Down
9 changes: 1 addition & 8 deletions src/libraries/sendtohelix-wasm.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@
<_workItemTimeout Condition="'$(NeedsToBuildWasmAppsOnHelix)' == 'true'">01:00:00</_workItemTimeout>

<WasmBuildTargetsDir>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'mono', 'wasm', 'build'))</WasmBuildTargetsDir>
<TestEchoMiddleware>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'bin', 'NetCoreServer', '$(Configuration)', '$(AspNetCoreAppCurrent)'))</TestEchoMiddleware>
<RemoteLoopMiddleware>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'bin', 'RemoteLoopServer', '$(Configuration)', '$(AspNetCoreAppCurrent)'))</RemoteLoopMiddleware>
<_ShippingPackagesPath>$([MSBuild]::NormalizeDirectory($(ArtifactsDir), 'packages', $(Configuration), 'Shipping'))</_ShippingPackagesPath>
<WorkItemPrefix Condition="'$(WorkItemPrefix)' == '' and '$(Scenario)' != ''">$(Scenario)-</WorkItemPrefix>

Expand Down Expand Up @@ -57,7 +55,7 @@
<IncludeNodePayload Condition="'$(NeedsEMSDKNode)' == 'true' and '$(NeedsEMSDK)' != 'true'">true</IncludeNodePayload>
</PropertyGroup>

<Import Project="$(TestArchiveTestsDir)*.helix.targets" />
<Import Project="$(TestArchiveRoot)**\*.helix.targets" />

<PropertyGroup>
<_HelixLocalNodePath Condition="'$(NeedsEMSDKNode)' == 'true' and '$(WindowsShell)' != 'true'">$HELIX_CORRELATION_PAYLOAD/build/emsdk-node</_HelixLocalNodePath>
Expand Down Expand Up @@ -186,11 +184,6 @@
<HelixCorrelationPayload Include="$(EmSdkDirForHelixPayload)node" Destination="build/emsdk-node" />
</ItemGroup>

<ItemGroup Condition="'$(Scenario)' == '' or '$(Scenario)' == 'normal' or '$(Scenario)' == 'WasmTestOnBrowser' or '$(Scenario)' == 'WasmTestOnNodeJS'">
<HelixCorrelationPayload Include="$(TestEchoMiddleware)" Destination="xharness/TestEchoMiddleware" Condition="Exists('$(TestEchoMiddleware)')" />
<HelixCorrelationPayload Include="$(RemoteLoopMiddleware)" Destination="xharness/RemoteLoopMiddleware" Condition="Exists('$(RemoteLoopMiddleware)')" />
</ItemGroup>

<ItemGroup Condition="'$(NeedsBuiltNugets)' == 'true'">
<HelixCorrelationPayload Include="$(_ShippingPackagesPath)" Destination="built-nugets" />
</ItemGroup>
Expand Down