Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,9 @@ csharp_style_allow_blank_line_after_token_in_conditional_expression_experimental
# CA2254: The logging message template should not vary between calls to 'ILogger.Log*'
dotnet_diagnostic.CA2254.severity = warning

# CA1305: Provide a value for the 'IFormatProvider' argument
dotnet_diagnostic.CA1305.severity = none

# IDE0058
csharp_style_unused_value_expression_statement_preference = discard_variable:none

Expand Down
2 changes: 1 addition & 1 deletion NuGet.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<clear />
Expand Down
7 changes: 5 additions & 2 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -230,14 +230,17 @@ stages:
- powershell: eng\SetupVSHive.ps1
displayName: Setup VS Hive

# https://github.com/dotnet/razor/issues/8378
# Restore the following flag to the below script to re-enable integration tests.
# -integrationTest
- script: eng\CIBuild.cmd
-configuration $(_BuildConfig)
-prepareMachine
-test
-integrationTest
/p:BuildProjectReferences=false
name: Run_Tests
displayName: Run Unit and Integration tests
# displayName: Run Unit and Integration tests
displayName: Run Unit tests
condition: succeeded()

- task: PublishBuildArtifacts@1
Expand Down
6 changes: 3 additions & 3 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.AspNetCore.Razor.Symbols.Transport" Version="7.0.0-preview.5.22528.1">
Expand Down Expand Up @@ -32,9 +32,9 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>3a25a7f1cc446b60678ed25c9d829420d6321eba</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22524.5">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23152.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c5dd6a1da2e6d9b3423ab809fcda8af2927a408b</Sha>
<Sha>6b3afa7543dd5d69e621015cd1569fb0960b5f24</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
5 changes: 2 additions & 3 deletions eng/Versions.props
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- Opt-in arcade features -->
<PropertyGroup>
<UsingToolVSSDK>true</UsingToolVSSDK>
Expand Down Expand Up @@ -79,7 +79,7 @@
<MicrosoftVisualStudioPackagesVersion>17.5.274-preview</MicrosoftVisualStudioPackagesVersion>
<RoslynPackageVersion>4.6.0-2.23113.15</RoslynPackageVersion>
<VisualStudioLanguageServerProtocolVersion>17.6.4-preview</VisualStudioLanguageServerProtocolVersion>
<MicrosoftNetCompilersToolsetVersion>4.4.0</MicrosoftNetCompilersToolsetVersion>
<MicrosoftNetCompilersToolsetVersion>4.6.0-2.23128.3</MicrosoftNetCompilersToolsetVersion>
<MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>$(RoslynPackageVersion)</MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>
<!-- dotnet/runtime packages -->
<MicrosoftExtensionsPackageVersion>6.0.0</MicrosoftExtensionsPackageVersion>
Expand Down Expand Up @@ -136,7 +136,6 @@
<StreamJsonRpcPackageVersion>2.14.20</StreamJsonRpcPackageVersion>
<SystemRuntimeInteropServicesRuntimePackageVersion>4.3.0</SystemRuntimeInteropServicesRuntimePackageVersion>
<Tooling_MicrosoftCodeAnalysisAnalyzersPackageVersion>3.3.4</Tooling_MicrosoftCodeAnalysisAnalyzersPackageVersion>
<Tooling_MicrosoftCodeAnalysisNetAnalyzersPackageVersion>7.0.0-preview1.22116.1</Tooling_MicrosoftCodeAnalysisNetAnalyzersPackageVersion>
<MicrosoftCodeAnalysisExternalAccessRazorPackageVersion>$(RoslynPackageVersion)</MicrosoftCodeAnalysisExternalAccessRazorPackageVersion>
<MicrosoftCodeAnalysisExternalAccessOmniSharpCSharpPackageVersion>$(RoslynPackageVersion)</MicrosoftCodeAnalysisExternalAccessOmniSharpCSharpPackageVersion>
<MicrosoftCodeAnalysisCommonPackageVersion>$(RoslynPackageVersion)</MicrosoftCodeAnalysisCommonPackageVersion>
Expand Down
4 changes: 4 additions & 0 deletions eng/common/BuildConfiguration/build-configuration.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"RetryCountLimit": 1,
"RetryByAnyError": false
}
2 changes: 1 addition & 1 deletion eng/common/PSScriptAnalyzerSettings.psd1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@{
@{
IncludeRules=@('PSAvoidUsingCmdletAliases',
'PSAvoidUsingWMICmdlet',
'PSAvoidUsingPositionalParameters',
Expand Down
2 changes: 1 addition & 1 deletion eng/common/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Don't touch this folder
# Don't touch this folder

uuuuuuuuuuuuuuuuuuuu
u" uuuuuuuuuuuuuuuuuu "u
Expand Down
2 changes: 1 addition & 1 deletion eng/common/SetupNugetSources.ps1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This file is a temporary workaround for internal builds to be able to restore from private AzDO feeds.
# This file is a temporary workaround for internal builds to be able to restore from private AzDO feeds.
# This file should be removed as part of this issue: https://github.com/dotnet/arcade/issues/4080
#
# What the script does is iterate over all package sources in the pointed NuGet.config and add a credential entry
Expand Down
2 changes: 1 addition & 1 deletion eng/common/build.ps1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[CmdletBinding(PositionalBinding=$false)]
[CmdletBinding(PositionalBinding=$false)]
Param(
[string][Alias('c')]$configuration = "Debug",
[string]$platform = $null,
Expand Down
2 changes: 1 addition & 1 deletion eng/common/cross/arm/sources.list.bionic
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
deb http://ports.ubuntu.com/ubuntu-ports/ bionic main restricted universe
deb http://ports.ubuntu.com/ubuntu-ports/ bionic main restricted universe
deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic main restricted universe

deb http://ports.ubuntu.com/ubuntu-ports/ bionic-updates main restricted universe
Expand Down
2 changes: 1 addition & 1 deletion eng/common/cross/arm/sources.list.focal
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
deb http://ports.ubuntu.com/ubuntu-ports/ focal main restricted universe
deb http://ports.ubuntu.com/ubuntu-ports/ focal main restricted universe
deb-src http://ports.ubuntu.com/ubuntu-ports/ focal main restricted universe

deb http://ports.ubuntu.com/ubuntu-ports/ focal-updates main restricted universe
Expand Down
2 changes: 1 addition & 1 deletion eng/common/cross/arm/sources.list.jammy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
deb http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted universe
deb http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted universe
deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted universe

deb http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main restricted universe
Expand Down
2 changes: 1 addition & 1 deletion eng/common/cross/arm/sources.list.jessie
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Debian (sid) # UNSTABLE
# Debian (sid) # UNSTABLE
deb http://ftp.debian.org/debian/ sid main contrib non-free
deb-src http://ftp.debian.org/debian/ sid main contrib non-free
2 changes: 1 addition & 1 deletion eng/common/cross/arm/sources.list.xenial
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
deb http://ports.ubuntu.com/ubuntu-ports/ xenial main restricted universe
deb http://ports.ubuntu.com/ubuntu-ports/ xenial main restricted universe
deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial main restricted universe

deb http://ports.ubuntu.com/ubuntu-ports/ xenial-updates main restricted universe
Expand Down
2 changes: 1 addition & 1 deletion eng/common/cross/arm/sources.list.zesty
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
deb http://ports.ubuntu.com/ubuntu-ports/ zesty main restricted universe
deb http://ports.ubuntu.com/ubuntu-ports/ zesty main restricted universe
deb-src http://ports.ubuntu.com/ubuntu-ports/ zesty main restricted universe

deb http://ports.ubuntu.com/ubuntu-ports/ zesty-updates main restricted universe
Expand Down
35 changes: 0 additions & 35 deletions eng/common/cross/arm/tizen-build-rootfs.sh

This file was deleted.

170 changes: 0 additions & 170 deletions eng/common/cross/arm/tizen-fetch.sh

This file was deleted.

2 changes: 1 addition & 1 deletion eng/common/cross/arm/tizen/tizen.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so
diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so
--- a/usr/lib/libc.so 2016-12-30 23:00:08.284951863 +0900
+++ b/usr/lib/libc.so 2016-12-30 23:00:32.140951815 +0900
@@ -2,4 +2,4 @@
Expand Down
2 changes: 1 addition & 1 deletion eng/common/cross/arm64/sources.list.bionic
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
deb http://ports.ubuntu.com/ubuntu-ports/ bionic main restricted universe
deb http://ports.ubuntu.com/ubuntu-ports/ bionic main restricted universe
deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic main restricted universe

deb http://ports.ubuntu.com/ubuntu-ports/ bionic-updates main restricted universe
Expand Down
2 changes: 1 addition & 1 deletion eng/common/cross/arm64/sources.list.buster
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
deb http://deb.debian.org/debian buster main
deb http://deb.debian.org/debian buster main
deb-src http://deb.debian.org/debian buster main

deb http://deb.debian.org/debian-security/ buster/updates main
Expand Down
2 changes: 1 addition & 1 deletion eng/common/cross/arm64/sources.list.focal
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
deb http://ports.ubuntu.com/ubuntu-ports/ focal main restricted universe
deb http://ports.ubuntu.com/ubuntu-ports/ focal main restricted universe
deb-src http://ports.ubuntu.com/ubuntu-ports/ focal main restricted universe

deb http://ports.ubuntu.com/ubuntu-ports/ focal-updates main restricted universe
Expand Down
2 changes: 1 addition & 1 deletion eng/common/cross/arm64/sources.list.jammy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
deb http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted universe
deb http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted universe
deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted universe

deb http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main restricted universe
Expand Down
2 changes: 1 addition & 1 deletion eng/common/cross/arm64/sources.list.stretch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
deb http://deb.debian.org/debian stretch main
deb http://deb.debian.org/debian stretch main
deb-src http://deb.debian.org/debian stretch main

deb http://deb.debian.org/debian-security/ stretch/updates main
Expand Down
2 changes: 1 addition & 1 deletion eng/common/cross/arm64/sources.list.xenial
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
deb http://ports.ubuntu.com/ubuntu-ports/ xenial main restricted universe
deb http://ports.ubuntu.com/ubuntu-ports/ xenial main restricted universe
deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial main restricted universe

deb http://ports.ubuntu.com/ubuntu-ports/ xenial-updates main restricted universe
Expand Down
2 changes: 1 addition & 1 deletion eng/common/cross/arm64/sources.list.zesty
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
deb http://ports.ubuntu.com/ubuntu-ports/ zesty main restricted universe
deb http://ports.ubuntu.com/ubuntu-ports/ zesty main restricted universe
deb-src http://ports.ubuntu.com/ubuntu-ports/ zesty main restricted universe

deb http://ports.ubuntu.com/ubuntu-ports/ zesty-updates main restricted universe
Expand Down
Loading