Skip to content

net8 rc2 #161

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.

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
merged 4 commits into from
Oct 27, 2023
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
8 changes: 4 additions & 4 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,18 @@ jobs:

steps:
- uses: actions/checkout@v2
- uses: microsoft/setup-msbuild@v1.0.2
- uses: microsoft/setup-msbuild@v1.3.1
if: matrix.os == 'windows-latest'

- name: "Set up Java: 11"
uses: actions/setup-java@v1
with:
java-version: 11

- name: Setup .NET SDK (v7.0)
uses: actions/setup-dotnet@v1
- name: Setup .NET SDK
uses: actions/setup-dotnet@v3
with:
dotnet-version: '7.0.x'
dotnet-version: '8.0.x'

- name: Install Android workload (macOS)
if: matrix.os == 'macos-latest'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0-android</TargetFramework>
<!-- To get access to Microsoft.Maui.Media (screenshots) isn't available via NuGet-->
<UseMauiEssentials>true</UseMauiEssentials>
<TargetFramework>net8.0-android</TargetFramework>
<UseSentryCLI>false</UseSentryCLI>
</PropertyGroup>

Expand All @@ -15,6 +13,8 @@
<PackageReference Include="Sentry" Version="3.36.0" />
<PackageReference Include="Sentry.Extensions.Logging" Version="3.36.0" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<!-- To get access to Microsoft.Maui.Media (screenshots)-->
<PackageReference Include="Microsoft.Maui.Essentials" Version="8.0.0-rc.2.9373" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/SymbolCollector.Android/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
android:versionCode="1"
android:versionName="1.12.0"
package="io.sentry.symbolcollector.android">
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="33" />
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="34" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<application android:allowBackup="true"
Expand Down
5 changes: 2 additions & 3 deletions src/SymbolCollector.Android/SymbolCollector.Android.csproj
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0-android</TargetFramework>
<TargetFramework>net8.0-android</TargetFramework>
<OutputType>Exe</OutputType>
<!-- It needs to be set in the final app or: System.IO.FileNotFoundException: Could not load file or assembly 'Microsoft.Maui.Essentials, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null' or one of its dependencies.-->
<UseMauiEssentials>true</UseMauiEssentials>
<!-- Disabled to get this to work with Xamarin.UITest -->
<AndroidUseAssemblyStore>False</AndroidUseAssemblyStore>
<!-- Docs say removed on Xam.Android 11.2 https://docs.microsoft.com/en-us/xamarin/android/deploy-test/building-apps/build-properties#androidusesharedruntime-->
Expand All @@ -14,6 +12,7 @@
<!-- XA4218: Unable to find //manifest/application/uses-library at path: /Library/Android/sdk/platforms/android-33/optional/androidx.window.extensions.jar
ignore because not required: <uses-library android:name="androidx.window.extensions" android:required="false" /> -->
<NoWarn>$(NoWarn);XA4218</NoWarn>
<AndroidStripILAfterAOT>true</AndroidStripILAfterAOT>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
Expand Down
2 changes: 1 addition & 1 deletion src/SymbolCollector.Console/SymbolCollector.Console.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<!-- This should be picked up from Directory.Build.props but after adding a dependency to-->
<!-- System.CommandLine.DragonFruit it will fail to `dotnet run` without it set here:-->
<NoWarn Condition="'$(Configuration)' == 'Debug'">$(NoWarn);CS1591</NoWarn>
Expand Down
10 changes: 6 additions & 4 deletions src/SymbolCollector.Core/CounterStream.cs
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@ public override long Position
set => _streamImplementation.Position = value;
}

public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback? callback, object? state)
{
return _streamImplementation.BeginRead(buffer, offset, count, callback, state);
}

public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback? callback, object? state)
{
return _streamImplementation.BeginWrite(buffer, offset, count, callback, state);
}
Expand Down Expand Up @@ -135,12 +135,14 @@ public override void WriteByte(byte value)
public override bool CanTimeout { get; }
public override int ReadTimeout { get; set; }
public override int WriteTimeout { get; set; }

[Obsolete("This Remoting API is not supported and throws PlatformNotSupportedException.", DiagnosticId = "SYSLIB0010", UrlFormat = "https://aka.ms/dotnet-warnings/{0}")]
public override object InitializeLifetimeService()
{
return _streamImplementation.InitializeLifetimeService();
}

public override bool Equals(object obj)
public override bool Equals(object? obj)
{
return _streamImplementation.Equals(obj);
}
Expand All @@ -150,7 +152,7 @@ public override int GetHashCode()
return _streamImplementation.GetHashCode();
}

public override string ToString()
public override string? ToString()
{
return _streamImplementation.ToString();
}
Expand Down
2 changes: 1 addition & 1 deletion src/SymbolCollector.Core/SymbolCollector.Core.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.1</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<UseSentryCLI>false</UseSentryCLI>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/SymbolCollector.Server/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
{
context.Response.OnStarting(() =>
{
context.Response.Headers.Add("TraceIdentifier", new[] {context.TraceIdentifier});
context.Response.Headers["TraceIdentifier"] = new[] {context.TraceIdentifier};
return Task.CompletedTask;
});
await func();
Expand Down
2 changes: 1 addition & 1 deletion src/SymbolCollector.Server/SymbolCollector.Server.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<!-- For symbol uploading -->
<SentryProject>android-symbol-collector-server</SentryProject>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<IsPackable>false</IsPackable>
<UseSentryCLI>false</UseSentryCLI>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<IsPackable>false</IsPackable>
<UseSentryCLI>false</UseSentryCLI>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<IsPackable>false</IsPackable>
<UseSentryCLI>false</UseSentryCLI>
</PropertyGroup>
Expand Down