Skip to content

Commit 700b0e8

Browse files
martincostellomartincostello
authored
Update to ASP.NET Core 7 (#137)
* Bump version to 7.0.0 Bump version to 7.0.0 for next major release. * Update to ASP.NET Core 7 preview 1 Update to target .NET 7 and ASP.NET Core 7 preview 1. * Update to ASP.NET Core 7 preview 2 Update to ASP.NET Core 7 preview 2. * Update to ASP.NET Core 7 preview 3 Update to preview 3 of ASP.NET Core 7. * Update to ASP.NET Core 7 preview 4 Update to preview 4 of ASP.NET Core 7. * Remove workaround for RSG002 Remove workaround for RSG002 compiler error, which I can no longer replicate. * Update to ASP.NET Core 7 preview 5 Update to preview 5 of ASP.NET Core 7. * Update to ASP.NET Core 7 preview 6 Update to preview 6 of ASP.NET Core 7. * Update to ASP.NET Core 7 preview 7 Update to preview 7 of ASP.NET Core 7. * Update to ASP.NET Core 7 RC 1 Update to release candidate 1 of ASP.NET Core 7. * Update to ASP.NET Core 7 RC 2 Update to release candidate 2 of ASP.NET Core 7. * Update Arcade Update Arcade to the latest v7 version used by ASP.NET Core. * Set executable bit Set the executable bit for the new Arcade shell scripts. * Update dependencies Update NuGet packages to their latest versions. * Update to ASP.NET Core 7 Update to the stable release of ASP.NET Core 7. * Revert build workflow changes Revert changes to build for the `dev-7.0.0` branch. * Revert change to publish packages for .NET 7 Revert change missed from the previous commit. * Revert PreRelease properties Revert changes to the `PreRelease*` MSBuild properties for .NET 7 previews.
1 parent cdc2cd0 commit 700b0e8

File tree

79 files changed

+2181
-1877
lines changed

Some content is hidden

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

79 files changed

+2181
-1877
lines changed

‎AspNet.Security.OpenId.Providers.ruleset

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<RuleSet Name="AspNet.Security.OpenId.Providers Rules" Description="This rule set contains rules for the AspNet.Security.OpenId.Providers solution." ToolsVersion="16.0">
2+
<RuleSet Name="AspNet.Security.OpenId.Providers Rules" Description="This rule set contains rules for the AspNet.Security.OpenId.Providers solution." ToolsVersion="17.0">
33
<IncludeAll Action="Warning" />
44
<Rules AnalyzerId="Microsoft.Analyzers.ManagedCodeAnalysis" RuleNamespace="Microsoft.Rules.Managed">
55
<Rule Id="CA1014" Action="None" />

‎Directory.Build.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
44

55
<PropertyGroup>
6-
<DefaultNetCoreTargetFramework>net6.0</DefaultNetCoreTargetFramework>
6+
<DefaultNetCoreTargetFramework>net7.0</DefaultNetCoreTargetFramework>
77
<LangVersion>latest</LangVersion>
88
<NoWarn>$(NoWarn);CS1591</NoWarn>
99
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>

‎Packages.props

+7-7
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
<ItemGroup>
44
<PackageReference Update="AngleSharp" Version="0.13.0" />
5-
<PackageReference Update="JetBrains.Annotations" Version="2021.3.0" />
6-
<PackageReference Update="JustEat.HttpClientInterception" Version="3.1.1" />
7-
<PackageReference Update="MartinCostello.Logging.XUnit" Version="0.2.0" />
8-
<PackageReference Update="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.0" />
9-
<PackageReference Update="Microsoft.AspNetCore.TestHost" Version="6.0.0" />
5+
<PackageReference Update="JetBrains.Annotations" Version="2022.1.0" />
6+
<PackageReference Update="JustEat.HttpClientInterception" Version="3.1.2" />
7+
<PackageReference Update="MartinCostello.Logging.XUnit" Version="0.3.0" />
8+
<PackageReference Update="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.0" />
9+
<PackageReference Update="Microsoft.AspNetCore.TestHost" Version="7.0.0" />
1010
<PackageReference Update="Microsoft.IdentityModel.Protocols" Version="6.10.0" />
11-
<PackageReference Update="Shouldly" Version="3.0.2" />
12-
<PackageReference Update="System.Text.Json" Version="6.0.0" />
11+
<PackageReference Update="Shouldly" Version="4.1.0" />
12+
<PackageReference Update="System.Text.Json" Version="7.0.0" />
1313
</ItemGroup>
1414

1515
</Project>

‎eng/Versions.props

+8-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project>
22

33
<PropertyGroup>
4-
<MajorVersion>6</MajorVersion>
4+
<MajorVersion>7</MajorVersion>
55
<MinorVersion>0</MinorVersion>
6-
<PatchVersion>1</PatchVersion>
6+
<PatchVersion>0</PatchVersion>
77
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
8-
<PackageValidationBaselineVersion>6.0.0</PackageValidationBaselineVersion>
8+
<PackageValidationBaselineVersion>7.0.0</PackageValidationBaselineVersion>
99
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
1010
<PreReleaseVersionIteration></PreReleaseVersionIteration>
1111
<PreReleaseBrandingLabel>Preview $(PreReleaseVersionIteration)</PreReleaseBrandingLabel>
@@ -15,4 +15,9 @@
1515
<IncludePreReleaseLabelInPackageVersion Condition=" '$(DotNetFinalVersionKind)' == 'release' ">false</IncludePreReleaseLabelInPackageVersion>
1616
</PropertyGroup>
1717

18+
<!-- TODO Remove once 7.0.0 published to NuGet.org -->
19+
<PropertyGroup>
20+
<DisablePackageBaselineValidation>true</DisablePackageBaselineValidation>
21+
</PropertyGroup>
22+
1823
</Project>

‎eng/common/SetupNugetSources.ps1

+9-9
Original file line numberDiff line numberDiff line change
@@ -146,22 +146,22 @@ $userName = "dn-bot"
146146
# Insert credential nodes for Maestro's private feeds
147147
InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -Password $Password
148148

149+
# 3.1 uses a different feed url format so it's handled differently here
149150
$dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']")
150151
if ($dotnet31Source -ne $null) {
151152
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password
152153
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
153154
}
154155

155-
$dotnet5Source = $sources.SelectSingleNode("add[@key='dotnet5']")
156-
if ($dotnet5Source -ne $null) {
157-
AddPackageSource -Sources $sources -SourceName "dotnet5-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password
158-
AddPackageSource -Sources $sources -SourceName "dotnet5-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
159-
}
156+
$dotnetVersions = @('5','6','7')
160157

161-
$dotnet6Source = $sources.SelectSingleNode("add[@key='dotnet6']")
162-
if ($dotnet6Source -ne $null) {
163-
AddPackageSource -Sources $sources -SourceName "dotnet6-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet6-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password
164-
AddPackageSource -Sources $sources -SourceName "dotnet6-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet6-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
158+
foreach ($dotnetVersion in $dotnetVersions) {
159+
$feedPrefix = "dotnet" + $dotnetVersion;
160+
$dotnetSource = $sources.SelectSingleNode("add[@key='$feedPrefix']")
161+
if ($dotnetSource -ne $null) {
162+
AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password
163+
AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
164+
}
165165
}
166166

167167
$doc.Save($filename)

‎eng/common/SetupNugetSources.sh

+24-44
Original file line numberDiff line numberDiff line change
@@ -105,53 +105,33 @@ if [ "$?" == "0" ]; then
105105
PackageSources+=('dotnet3.1-internal-transport')
106106
fi
107107

108-
# Ensure dotnet5-internal and dotnet5-internal-transport are in the packageSources if the public dotnet5 feeds are present
109-
grep -i "<add key=\"dotnet5\"" $ConfigFile
110-
if [ "$?" == "0" ]; then
111-
grep -i "<add key=\"dotnet5-internal\"" $ConfigFile
112-
if [ "$?" != "0" ]; then
113-
echo "Adding dotnet5-internal to the packageSources."
114-
PackageSourcesNodeFooter="</packageSources>"
115-
PackageSourceTemplate="${TB}<add key=\"dotnet5-internal\" value=\"https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal/nuget/v2\" />"
116-
117-
sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile
118-
fi
119-
PackageSources+=('dotnet5-internal')
120-
121-
grep -i "<add key=\"dotnet5-internal-transport\">" $ConfigFile
122-
if [ "$?" != "0" ]; then
123-
echo "Adding dotnet5-internal-transport to the packageSources."
124-
PackageSourcesNodeFooter="</packageSources>"
125-
PackageSourceTemplate="${TB}<add key=\"dotnet5-internal-transport\" value=\"https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v2\" />"
126-
127-
sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile
128-
fi
129-
PackageSources+=('dotnet5-internal-transport')
130-
fi
131-
132-
# Ensure dotnet6-internal and dotnet6-internal-transport are in the packageSources if the public dotnet6 feeds are present
133-
grep -i "<add key=\"dotnet6\"" $ConfigFile
134-
if [ "$?" == "0" ]; then
135-
grep -i "<add key=\"dotnet6-internal\"" $ConfigFile
136-
if [ "$?" != "0" ]; then
137-
echo "Adding dotnet6-internal to the packageSources."
138-
PackageSourcesNodeFooter="</packageSources>"
139-
PackageSourceTemplate="${TB}<add key=\"dotnet6-internal\" value=\"https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet6-internal/nuget/v2\" />"
108+
DotNetVersions=('5' '6' '7')
109+
110+
for DotNetVersion in ${DotNetVersions[@]} ; do
111+
FeedPrefix="dotnet${DotNetVersion}";
112+
grep -i "<add key=\"$FeedPrefix\"" $ConfigFile
113+
if [ "$?" == "0" ]; then
114+
grep -i "<add key=\"$FeedPrefix-internal\"" $ConfigFile
115+
if [ "$?" != "0" ]; then
116+
echo "Adding $FeedPrefix-internal to the packageSources."
117+
PackageSourcesNodeFooter="</packageSources>"
118+
PackageSourceTemplate="${TB}<add key=\"$FeedPrefix-internal\" value=\"https://pkgs.dev.azure.com/dnceng/internal/_packaging/$FeedPrefix-internal/nuget/v2\" />"
119+
120+
sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile
121+
fi
122+
PackageSources+=("$FeedPrefix-internal")
140123

141-
sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile
142-
fi
143-
PackageSources+=('dotnet6-internal')
124+
grep -i "<add key=\"$FeedPrefix-internal-transport\">" $ConfigFile
125+
if [ "$?" != "0" ]; then
126+
echo "Adding $FeedPrefix-internal-transport to the packageSources."
127+
PackageSourcesNodeFooter="</packageSources>"
128+
PackageSourceTemplate="${TB}<add key=\"$FeedPrefix-internal-transport\" value=\"https://pkgs.dev.azure.com/dnceng/internal/_packaging/$FeedPrefix-internal-transport/nuget/v2\" />"
144129

145-
grep -i "<add key=\"dotnet6-internal-transport\">" $ConfigFile
146-
if [ "$?" != "0" ]; then
147-
echo "Adding dotnet6-internal-transport to the packageSources."
148-
PackageSourcesNodeFooter="</packageSources>"
149-
PackageSourceTemplate="${TB}<add key=\"dotnet6-internal-transport\" value=\"https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet6-internal-transport/nuget/v2\" />"
150-
151-
sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile
130+
sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile
131+
fi
132+
PackageSources+=("$FeedPrefix-internal-transport")
152133
fi
153-
PackageSources+=('dotnet6-internal-transport')
154-
fi
134+
done
155135

156136
# I want things split line by line
157137
PrevIFS=$IFS

‎eng/common/build.ps1

+5
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ Param(
2626
[string] $runtimeSourceFeed = '',
2727
[string] $runtimeSourceFeedKey = '',
2828
[switch] $excludePrereleaseVS,
29+
[switch] $nativeToolsOnMachine,
2930
[switch] $help,
3031
[Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
3132
)
@@ -67,6 +68,7 @@ function Print-Usage() {
6768
Write-Host " -warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
6869
Write-Host " -msbuildEngine <value> Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
6970
Write-Host " -excludePrereleaseVS Set to exclude build engines in prerelease versions of Visual Studio"
71+
Write-Host " -nativeToolsOnMachine Sets the native tools on machine environment variable (indicating that the script should use native tools on machine)"
7072
Write-Host ""
7173

7274
Write-Host "Command line arguments not listed above are passed thru to msbuild."
@@ -146,6 +148,9 @@ try {
146148
$nodeReuse = $false
147149
}
148150

151+
if ($nativeToolsOnMachine) {
152+
$env:NativeToolsOnMachine = $true
153+
}
149154
if ($restore) {
150155
InitializeNativeTools
151156
}

‎eng/common/build.sh

+16-5
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ usage()
1919
echo "Actions:"
2020
echo " --restore Restore dependencies (short: -r)"
2121
echo " --build Build solution (short: -b)"
22+
echo " --sourceBuild Source-build the solution (short: -sb)"
23+
echo " Will additionally trigger the following actions: --restore, --build, --pack"
24+
echo " If --configuration is not set explicitly, will also set it to 'Release'"
2225
echo " --rebuild Rebuild solution"
2326
echo " --test Run all unit tests in the solution (short: -t)"
2427
echo " --integrationTest Run all integration tests in the solution"
@@ -55,6 +58,7 @@ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
5558

5659
restore=false
5760
build=false
61+
source_build=false
5862
rebuild=false
5963
test=false
6064
integration_test=false
@@ -73,7 +77,7 @@ exclude_ci_binary_log=false
7377
pipelines_log=false
7478

7579
projects=''
76-
configuration='Debug'
80+
configuration=''
7781
prepare_machine=false
7882
verbosity='minimal'
7983
runtime_source_feed=''
@@ -119,6 +123,12 @@ while [[ $# > 0 ]]; do
119123
-pack)
120124
pack=true
121125
;;
126+
-sourcebuild|-sb)
127+
build=true
128+
source_build=true
129+
restore=true
130+
pack=true
131+
;;
122132
-test|-t)
123133
test=true
124134
;;
@@ -168,6 +178,10 @@ while [[ $# > 0 ]]; do
168178
shift
169179
done
170180

181+
if [[ -z "$configuration" ]]; then
182+
if [[ "$source_build" = true ]]; then configuration="Release"; else configuration="Debug"; fi
183+
fi
184+
171185
if [[ "$ci" == true ]]; then
172186
pipelines_log=true
173187
node_reuse=false
@@ -187,10 +201,6 @@ function InitializeCustomToolset {
187201
}
188202

189203
function Build {
190-
191-
if [[ "$ci" == true ]]; then
192-
TryLogClientIpAddress
193-
fi
194204
InitializeToolset
195205
InitializeCustomToolset
196206

@@ -209,6 +219,7 @@ function Build {
209219
/p:RepoRoot="$repo_root" \
210220
/p:Restore=$restore \
211221
/p:Build=$build \
222+
/p:ArcadeBuildFromSource=$source_build \
212223
/p:Rebuild=$rebuild \
213224
/p:Test=$test \
214225
/p:Pack=$pack \

‎eng/common/cross/arm/sources.list.focal

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
deb http://ports.ubuntu.com/ubuntu-ports/ focal main restricted universe
2+
deb-src http://ports.ubuntu.com/ubuntu-ports/ focal main restricted universe
3+
4+
deb http://ports.ubuntu.com/ubuntu-ports/ focal-updates main restricted universe
5+
deb-src http://ports.ubuntu.com/ubuntu-ports/ focal-updates main restricted universe
6+
7+
deb http://ports.ubuntu.com/ubuntu-ports/ focal-backports main restricted
8+
deb-src http://ports.ubuntu.com/ubuntu-ports/ focal-backports main restricted
9+
10+
deb http://ports.ubuntu.com/ubuntu-ports/ focal-security main restricted universe multiverse
11+
deb-src http://ports.ubuntu.com/ubuntu-ports/ focal-security main restricted universe multiverse

‎eng/common/cross/arm/sources.list.jammy

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
deb http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted universe
2+
deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted universe
3+
4+
deb http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main restricted universe
5+
deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main restricted universe
6+
7+
deb http://ports.ubuntu.com/ubuntu-ports/ jammy-backports main restricted
8+
deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-backports main restricted
9+
10+
deb http://ports.ubuntu.com/ubuntu-ports/ jammy-security main restricted universe multiverse
11+
deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-security main restricted universe multiverse

‎eng/common/cross/arm/tizen-build-rootfs.sh

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
#!/usr/bin/env bash
2+
set -e
3+
4+
__ARM_HARDFP_CrossDir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
5+
__TIZEN_CROSSDIR="$__ARM_HARDFP_CrossDir/tizen"
6+
7+
if [[ -z "$ROOTFS_DIR" ]]; then
8+
echo "ROOTFS_DIR is not defined."
9+
exit 1;
10+
fi
11+
12+
TIZEN_TMP_DIR=$ROOTFS_DIR/tizen_tmp
13+
mkdir -p $TIZEN_TMP_DIR
14+
15+
# Download files
16+
echo ">>Start downloading files"
17+
VERBOSE=1 $__ARM_HARDFP_CrossDir/tizen-fetch.sh $TIZEN_TMP_DIR
18+
echo "<<Finish downloading files"
19+
20+
echo ">>Start constructing Tizen rootfs"
21+
TIZEN_RPM_FILES=`ls $TIZEN_TMP_DIR/*.rpm`
22+
cd $ROOTFS_DIR
23+
for f in $TIZEN_RPM_FILES; do
24+
rpm2cpio $f | cpio -idm --quiet
25+
done
26+
echo "<<Finish constructing Tizen rootfs"
27+
28+
# Cleanup tmp
29+
rm -rf $TIZEN_TMP_DIR
30+
31+
# Configure Tizen rootfs
32+
echo ">>Start configuring Tizen rootfs"
33+
ln -sfn asm-arm ./usr/include/asm
34+
patch -p1 < $__TIZEN_CROSSDIR/tizen.patch
35+
echo "<<Finish configuring Tizen rootfs"

0 commit comments

Comments
 (0)