Skip to content

Commit 8c7307d

Browse files
bruno-garciabruno-garcia
authored
Revert "net8 rc2 (#161)"
This reverts commit 36c0529.
1 parent 44f3798 commit 8c7307d

File tree

12 files changed

+22
-22
lines changed

12 files changed

+22
-22
lines changed

‎.github/workflows/build.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,18 @@ jobs:
1818

1919
steps:
2020
- uses: actions/checkout@v2
21-
- uses: microsoft/setup-msbuild@v1.3.1
21+
- uses: microsoft/setup-msbuild@v1.0.2
2222
if: matrix.os == 'windows-latest'
2323

2424
- name: "Set up Java: 11"
2525
uses: actions/setup-java@v1
2626
with:
2727
java-version: 11
2828

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

3434
- name: Install Android workload (macOS)
3535
if: matrix.os == 'macos-latest'

‎src/SymbolCollector.Android.Library/SymbolCollector.Android.Library.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0-android</TargetFramework>
3+
<TargetFramework>net7.0-android</TargetFramework>
4+
<!-- To get access to Microsoft.Maui.Media (screenshots) isn't available via NuGet-->
5+
<UseMauiEssentials>true</UseMauiEssentials>
46
<UseSentryCLI>false</UseSentryCLI>
57
</PropertyGroup>
68

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

2020
</Project>

‎src/SymbolCollector.Android/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
android:versionCode="1"
44
android:versionName="1.13.0-alpha.1"
55
package="io.sentry.symbolcollector.android">
6-
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="34" />
6+
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="33" />
77
<uses-permission android:name="android.permission.INTERNET" />
88
<uses-permission android:name="android.permission.WAKE_LOCK" />
99
<application android:allowBackup="true"

‎src/SymbolCollector.Android/SymbolCollector.Android.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0-android</TargetFramework>
3+
<TargetFramework>net7.0-android</TargetFramework>
44
<OutputType>Exe</OutputType>
5+
<!-- 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.-->
6+
<UseMauiEssentials>true</UseMauiEssentials>
57
<!-- Disabled to get this to work with Xamarin.UITest -->
68
<AndroidUseAssemblyStore>False</AndroidUseAssemblyStore>
79
<!-- Docs say removed on Xam.Android 11.2 https://docs.microsoft.com/en-us/xamarin/android/deploy-test/building-apps/build-properties#androidusesharedruntime-->

‎src/SymbolCollector.Console/SymbolCollector.Console.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
5+
<TargetFramework>net7.0</TargetFramework>
66
<!-- This should be picked up from Directory.Build.props but after adding a dependency to-->
77
<!-- System.CommandLine.DragonFruit it will fail to `dotnet run` without it set here:-->
88
<NoWarn Condition="'$(Configuration)' == 'Debug'">$(NoWarn);CS1591</NoWarn>

‎src/SymbolCollector.Core/CounterStream.cs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@ public override long Position
4444
set => _streamImplementation.Position = value;
4545
}
4646

47-
public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback? callback, object? state)
47+
public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
4848
{
4949
return _streamImplementation.BeginRead(buffer, offset, count, callback, state);
5050
}
5151

52-
public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback? callback, object? state)
52+
public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
5353
{
5454
return _streamImplementation.BeginWrite(buffer, offset, count, callback, state);
5555
}
@@ -135,14 +135,12 @@ public override void WriteByte(byte value)
135135
public override bool CanTimeout { get; }
136136
public override int ReadTimeout { get; set; }
137137
public override int WriteTimeout { get; set; }
138-
139-
[Obsolete("This Remoting API is not supported and throws PlatformNotSupportedException.", DiagnosticId = "SYSLIB0010", UrlFormat = "https://aka.ms/dotnet-warnings/{0}")]
140138
public override object InitializeLifetimeService()
141139
{
142140
return _streamImplementation.InitializeLifetimeService();
143141
}
144142

145-
public override bool Equals(object? obj)
143+
public override bool Equals(object obj)
146144
{
147145
return _streamImplementation.Equals(obj);
148146
}
@@ -152,7 +150,7 @@ public override int GetHashCode()
152150
return _streamImplementation.GetHashCode();
153151
}
154152

155-
public override string? ToString()
153+
public override string ToString()
156154
{
157155
return _streamImplementation.ToString();
158156
}

‎src/SymbolCollector.Core/SymbolCollector.Core.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.1</TargetFrameworks>
55
<UseSentryCLI>false</UseSentryCLI>
66
</PropertyGroup>
77

‎src/SymbolCollector.Server/Startup.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
158158
{
159159
context.Response.OnStarting(() =>
160160
{
161-
context.Response.Headers["TraceIdentifier"] = new[] {context.TraceIdentifier};
161+
context.Response.Headers.Add("TraceIdentifier", new[] {context.TraceIdentifier});
162162
return Task.CompletedTask;
163163
});
164164
await func();

‎src/SymbolCollector.Server/SymbolCollector.Server.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
<!-- For symbol uploading -->
66
<SentryProject>android-symbol-collector-server</SentryProject>
77
</PropertyGroup>

‎test/SymbolCollector.Console.Tests/SymbolCollector.Console.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
<IsPackable>false</IsPackable>
66
<UseSentryCLI>false</UseSentryCLI>
77
</PropertyGroup>

‎test/SymbolCollector.Core.Tests/SymbolCollector.Core.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
<IsPackable>false</IsPackable>
66
<UseSentryCLI>false</UseSentryCLI>
77
</PropertyGroup>

‎test/SymbolCollector.Server.Tests/SymbolCollector.Server.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
<IsPackable>false</IsPackable>
66
<UseSentryCLI>false</UseSentryCLI>
77
</PropertyGroup>

0 commit comments

Comments
 (0)