Skip to content
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

Jump to bottom

fix: Importing link.xml instead of refreshing AssetDatabase #315

Merged
merged 4 commits into from
Sep 17, 2021
Merged

fix: Importing link.xml instead of refreshing AssetDatabase #315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ca2d806
importing link.xml instead of refreshing asset data base
bitsandfoxes Sep 16, 2021
3e54614
updated CHANGELOG.md
bitsandfoxes Sep 16, 2021
a57bc18
Update CHANGELOG.md
bruno-garcia Sep 17, 2021
8ce9f8f
Merge branch 'main' into fix/link-xml-import-error
bruno-garcia Sep 17, 2021
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
5 changes: 4 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@

## Unreleased

- Removed unused .asmdefs ([#316](https://github.com/getsentry/sentry-unity/pull/316))
### Fixes

- Import link.xml caused an infinite loop ([#315](https://github.com/getsentry/sentry-unity/pull/315))
- Removed unused .asmdefs which clears a warning from console ([#316](https://github.com/getsentry/sentry-unity/pull/316))

## 0.5.2

Expand Down
10 changes: 5 additions & 5 deletions src/Sentry.Unity.Editor/SentryWindow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public class SentryWindow : EditorWindow
[MenuItem("Tools/Sentry")]
public static SentryWindow OpenSentryWindow()
{
var window = (SentryWindow) GetWindow(typeof(SentryWindow));
var window = (SentryWindow)GetWindow(typeof(SentryWindow));
window.minSize = new Vector2(400, 350);
return window;
}
Expand All @@ -27,7 +27,7 @@ public static SentryWindow OpenSentryWindow()
public event Action<ValidationError> OnValidationError = _ => { };

private int _currentTab = 0;
private string[] _tabs = new[] {"Core", "Enrichment", "Transport", "Sessions", "Debug"};
private string[] _tabs = new[] { "Core", "Enrichment", "Transport", "Sessions", "Debug" };

private void OnEnable()
{
Expand Down Expand Up @@ -239,7 +239,7 @@ private void DisplayEnrichment()
"\nDefault: 100"),
Options.MaxBreadcrumbs);

Options.ReportAssembliesMode = (ReportAssembliesMode) EditorGUILayout.EnumPopup(
Options.ReportAssembliesMode = (ReportAssembliesMode)EditorGUILayout.EnumPopup(
new GUIContent("Report Assemblies Mode", "Whether or not to include referenced assemblies " +
"Version or InformationalVersion in each event sent to sentry."),
Options.ReportAssembliesMode);
Expand Down Expand Up @@ -326,7 +326,7 @@ private void DisplayDebug()
"builds of the player will not include Sentry's SDK diagnostics."),
Options.DebugOnlyInEditor);

Options.DiagnosticLevel = (SentryLevel) EditorGUILayout.EnumPopup(
Options.DiagnosticLevel = (SentryLevel)EditorGUILayout.EnumPopup(
new GUIContent("Verbosity Level", "The minimum level allowed to be printed to the console. " +
"Log messages with a level below this level are dropped."),
Options.DiagnosticLevel);
Expand Down Expand Up @@ -401,7 +401,7 @@ private void CopyLinkXmlToPlugins()
GetType().Assembly.GetManifestResourceStream("Sentry.Unity.Editor.Resources.link.xml");
resourceStream.CopyTo(fileStream);

AssetDatabase.Refresh();
AssetDatabase.ImportAsset(LinkXmlPath);
}
}

Expand Down