Skip to content

Removed Bridge sub-namespace in favor of Microsoft.ReactNative #3804

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 3 commits into from
Dec 19, 2019
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"type": "prerelease",
"comment": "Removed Bridge sub-namespace in favor of Microsoft.ReactNative",
"packageName": "react-native-windows",
"email": "vmorozov@microsoft.com",
"commit": "a547f8926dbcaf3c04b8c7a12c7a1e9b970acd6c",
"date": "2019-12-19T01:43:39.278Z"
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

using Microsoft.ReactNative.Bridge;
using Microsoft.ReactNative;
using Microsoft.ReactNative.Managed;

namespace TreeDumpLibrary
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
using Windows.UI.Xaml.Media;
using Windows.UI.Xaml.Controls;

using Microsoft.ReactNative.Managed;
using Microsoft.ReactNative.Bridge;
using Microsoft.ReactNative;
using Windows.UI.Xaml;
using Windows.UI.ViewManagement;
using System.Threading.Tasks;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#include "DebugConsole.h"

using namespace winrt::Microsoft::ReactNative::Bridge;
using namespace winrt::Microsoft::ReactNative;

namespace winrt::SampleAppCpp::implementation {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
// Licensed under the MIT License.

#pragma once
#include "winrt/Microsoft.ReactNative.Bridge.h"
#include "winrt/Microsoft.ReactNative.h"

using namespace winrt::Microsoft::ReactNative::Bridge;
using namespace winrt::Microsoft::ReactNative;

namespace winrt::SampleAppCpp::implementation {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#include <winrt/Windows.UI.Xaml.Navigation.h>
#include <winrt/Windows.UI.Xaml.h>

#include <winrt/Microsoft.ReactNative.Bridge.h>
#include <winrt/Microsoft.ReactNative.h>

#include <winrt/SampleLibraryCpp.h>
Expand All @@ -30,4 +29,4 @@
#include <winrt/Microsoft.UI.Xaml.Controls.Primitives.h>
#include <winrt/Microsoft.UI.Xaml.Controls.h>
#include <winrt/Microsoft.UI.Xaml.Media.h>
#include <winrt/Microsoft.UI.Xaml.XamlTypeInfo.h>
#include <winrt/Microsoft.UI.Xaml.XamlTypeInfo.h>
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include "CircleViewManagerCpp.h"

using namespace winrt;
using namespace Microsoft::ReactNative::Bridge;
using namespace Microsoft::ReactNative;

using namespace Windows::Foundation;
using namespace Windows::Foundation::Collections;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@

#pragma once

#include "winrt/Microsoft.ReactNative.Bridge.h"
#include "winrt/Microsoft.ReactNative.h"

namespace winrt::SampleLibraryCpp::implementation {

struct CircleViewManagerCpp : winrt::implements<
CircleViewManagerCpp,
winrt::Microsoft::ReactNative::Bridge::IViewManager,
winrt::Microsoft::ReactNative::Bridge::IViewManagerWithChildren> {
winrt::Microsoft::ReactNative::IViewManager,
winrt::Microsoft::ReactNative::IViewManagerWithChildren> {
public:
CircleViewManagerCpp();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include "DebugHelpers.h"

using namespace winrt;
using namespace Microsoft::ReactNative::Bridge;
using namespace Microsoft::ReactNative;
using namespace Windows::Foundation;
using namespace Windows::Foundation::Collections;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,30 @@

#pragma once

#include "winrt/Microsoft.ReactNative.Bridge.h"
#include "winrt/Microsoft.ReactNative.h"

namespace winrt::SampleLibraryCpp::implementation {

struct CustomUserControlViewManagerCpp
: winrt::implements<
CustomUserControlViewManagerCpp,
winrt::Microsoft::ReactNative::Bridge::IViewManager,
winrt::Microsoft::ReactNative::Bridge::IViewManagerWithNativeProperties,
winrt::Microsoft::ReactNative::Bridge::IViewManagerWithCommands,
winrt::Microsoft::ReactNative::Bridge::IViewManagerWithExportedEventTypeConstants> {
winrt::Microsoft::ReactNative::IViewManager,
winrt::Microsoft::ReactNative::IViewManagerWithNativeProperties,
winrt::Microsoft::ReactNative::IViewManagerWithCommands,
winrt::Microsoft::ReactNative::IViewManagerWithExportedEventTypeConstants> {
public:
CustomUserControlViewManagerCpp(winrt::Microsoft::ReactNative::Bridge::IReactContext const &reactContext);
CustomUserControlViewManagerCpp(winrt::Microsoft::ReactNative::IReactContext const &reactContext);

// IViewManager
winrt::hstring Name() noexcept;

winrt::Microsoft::ReactNative::Bridge::IReactContext ReactContext() noexcept;
winrt::Microsoft::ReactNative::IReactContext ReactContext() noexcept;

winrt::Windows::UI::Xaml::FrameworkElement CreateView() noexcept;

// IViewManagerWithNativeProperties
winrt::Windows::Foundation::Collections::
IMapView<winrt::hstring, winrt::Microsoft::ReactNative::Bridge::ViewManagerPropertyType>
IMapView<winrt::hstring, winrt::Microsoft::ReactNative::ViewManagerPropertyType>
NativeProps() noexcept;

void UpdateProperties(
Expand All @@ -51,7 +51,7 @@ struct CustomUserControlViewManagerCpp
ExportedCustomDirectEventTypeConstants() noexcept;

private:
winrt::Microsoft::ReactNative::Bridge::IReactContext m_reactContext{nullptr};
winrt::Microsoft::ReactNative::IReactContext m_reactContext{nullptr};
};

} // namespace winrt::SampleLibraryCpp::implementation
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "CustomUserControlViewManagerCpp.h"
#include "SampleModuleCpp.h"

using namespace winrt::Microsoft::ReactNative::Bridge;
using namespace winrt::Microsoft::ReactNative;

namespace winrt::SampleLibraryCpp::implementation {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#pragma once
#include "ReactPackageProvider.g.h"

using namespace winrt::Microsoft::ReactNative::Bridge;
using namespace winrt::Microsoft::ReactNative;

namespace winrt::SampleLibraryCpp::implementation {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ namespace SampleLibraryCpp
[webhosthidden]
[default_interface]
runtimeclass ReactPackageProvider
: Microsoft.ReactNative.Bridge.IReactPackageProvider {
: Microsoft.ReactNative.IReactPackageProvider {
ReactPackageProvider();
};
} // namespace CppModule
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ struct SampleModuleCpp {
}

REACT_METHOD(ExplicitPromiseMethod);
void ExplicitPromiseMethod(winrt::Microsoft::ReactNative::Bridge::ReactPromise<double> &&result) noexcept {
void ExplicitPromiseMethod(winrt::Microsoft::ReactNative::ReactPromise<double> &&result) noexcept {
DebugWriteLine(Name, "ExplicitPromiseMethod");
try {
result.Resolve(M_PI);
Expand All @@ -89,7 +89,7 @@ struct SampleModuleCpp {
REACT_METHOD(ExplicitPromiseMethodWithArgs);
void ExplicitPromiseMethodWithArgs(
double arg,
winrt::Microsoft::ReactNative::Bridge::ReactPromise<double> &&result) noexcept {
winrt::Microsoft::ReactNative::ReactPromise<double> &&result) noexcept {
DebugWriteLine(Name, "ExplicitPromiseMethodWithArgs", arg);
try {
result.Resolve(M_PI);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,4 @@
#include <winrt/Windows.UI.Xaml.Navigation.h>
#include <winrt/Windows.UI.Xaml.h>

#include <winrt/Microsoft.ReactNative.Bridge.h>
#include <winrt/Microsoft.ReactNative.h>
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Data;

using Microsoft.ReactNative.Bridge;
using Microsoft.ReactNative;

namespace SampleLibraryCS
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

using System;
using Microsoft.ReactNative;
using Microsoft.ReactNative.Managed;
using System.Diagnostics;

using Windows.UI.Xaml;
using Windows.UI.Xaml.Media;
using Windows.UI.Xaml.Controls;

using Microsoft.ReactNative.Managed;
using Microsoft.ReactNative.Bridge;
using Windows.UI.Xaml.Media;

namespace SampleLibraryCS
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

using Microsoft.ReactNative.Bridge;
using Microsoft.ReactNative;
using Microsoft.ReactNative.Managed;

namespace SampleLibraryCS
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include "JsonJSValueReader.h"
#include "catch.hpp"

namespace winrt::Microsoft::ReactNative::Bridge {
namespace winrt::Microsoft::ReactNative {

enum struct RobotModel {
T2,
Expand Down Expand Up @@ -463,4 +463,4 @@ TEST_CASE("TestWriteValueDefaultExtensions", "JSValueReaderTest") {
REQUIRE(jsValue["NullValue"] == JSValue::Null);
}

} // namespace winrt::Microsoft::ReactNative::Bridge
} // namespace winrt::Microsoft::ReactNative
4 changes: 2 additions & 2 deletions vnext/Microsoft.ReactNative.Cxx.UnitTests/JSValueTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "JsonJSValueReader.h"
#include "catch.hpp"

namespace winrt::Microsoft::ReactNative::Bridge {
namespace winrt::Microsoft::ReactNative {

TEST_CASE("TestReadObject", "JSValueTest") {
const wchar_t *json =
Expand Down Expand Up @@ -92,4 +92,4 @@ TEST_CASE("TestReadNestedArray", "JSValueTest") {
REQUIRE(nestedArr[6].Double() == 4.5);
}

} // namespace winrt::Microsoft::ReactNative::Bridge
} // namespace winrt::Microsoft::ReactNative
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "pch.h"
#include "JsonJSValueReader.h"

namespace winrt::Microsoft::ReactNative::Bridge {
namespace winrt::Microsoft::ReactNative {

//===========================================================================
// JsonJSValueReader implementation
Expand Down Expand Up @@ -157,4 +157,4 @@ bool JsonJSValueReader::IsContainerOrValue(JsonParseState parseState) noexcept {
parseState == JsonParseState::Value;
}

} // namespace winrt::Microsoft::ReactNative::Bridge
} // namespace winrt::Microsoft::ReactNative
6 changes: 3 additions & 3 deletions vnext/Microsoft.ReactNative.Cxx.UnitTests/JsonJSValueReader.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
#pragma once

#include "JsonReader.h"
#include "winrt/Microsoft.ReactNative.Bridge.h"
#include "winrt/Microsoft.ReactNative.h"

namespace winrt::Microsoft::ReactNative::Bridge {
namespace winrt::Microsoft::ReactNative {

struct JsonJSValueReader : implements<JsonJSValueReader, IJSValueReader> {
JsonJSValueReader(std::wstring &&jsonText) noexcept;
Expand Down Expand Up @@ -39,4 +39,4 @@ struct JsonJSValueReader : implements<JsonJSValueReader, IJSValueReader> {
};
};

} // namespace winrt::Microsoft::ReactNative::Bridge
} // namespace winrt::Microsoft::ReactNative
4 changes: 2 additions & 2 deletions vnext/Microsoft.ReactNative.Cxx.UnitTests/JsonReader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include "JsonReader.h"
#include "Crash.h"

namespace winrt::Microsoft::ReactNative::Bridge {
namespace winrt::Microsoft::ReactNative {

static bool IsSimpleWhitespace(wchar_t c) noexcept {
return (c == ' ' || c == '\t' || c == '\r' || c == '\n');
Expand Down Expand Up @@ -376,4 +376,4 @@ bool JsonReader::IsNull() noexcept {
return false;
}

} // namespace winrt::Microsoft::ReactNative::Bridge
} // namespace winrt::Microsoft::ReactNative
4 changes: 2 additions & 2 deletions vnext/Microsoft.ReactNative.Cxx.UnitTests/JsonReader.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include <stack>
#include <string_view>

namespace winrt::Microsoft::ReactNative::Bridge {
namespace winrt::Microsoft::ReactNative {

struct JsonSource {
static_assert(sizeof(wchar_t) == 2, "This code expects 2-byte wchars");
Expand Down Expand Up @@ -141,4 +141,4 @@ struct JsonReader {
bool m_isStringContent = false;
};

} // namespace winrt::Microsoft::ReactNative::Bridge
} // namespace winrt::Microsoft::ReactNative
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "ReactModuleBuilderMock.h"
#include "catch.hpp"

namespace winrt::Microsoft::ReactNative::Bridge {
namespace winrt::Microsoft::ReactNative {

REACT_STRUCT(Point)
struct Point {
Expand Down Expand Up @@ -772,4 +772,4 @@ TEST_CASE_METHOD(NativeModuleTestFixture, "TestEvent_EventField2", "NativeModule
REQUIRE(eventRaised == true);
}

} // namespace winrt::Microsoft::ReactNative::Bridge
} // namespace winrt::Microsoft::ReactNative
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include "ReactModuleBuilderMock.h"
#include "JSValue.h"

namespace winrt::Microsoft::ReactNative::Bridge {
namespace winrt::Microsoft::ReactNative {

//===========================================================================
// ReactModuleBuilderMock implementation
Expand Down Expand Up @@ -97,4 +97,4 @@ SyncMethodDelegate ReactModuleBuilderMock::GetSyncMethod(std::wstring const &met
return MakeJSValueTreeReader(std::move(jsValue));
}

} // namespace winrt::Microsoft::ReactNative::Bridge
} // namespace winrt::Microsoft::ReactNative
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include <functional>
#include "JSValue.h"

namespace winrt::Microsoft::ReactNative::Bridge {
namespace winrt::Microsoft::ReactNative {

struct ReactModuleBuilderMock {
template <class... TArgs>
Expand Down Expand Up @@ -220,4 +220,4 @@ inline void ReactModuleBuilderImpl::AddEventHandlerSetter(
m_mock.AddEventHandlerSetter(name, eventHandlerSetter);
}

} // namespace winrt::Microsoft::ReactNative::Bridge
} // namespace winrt::Microsoft::ReactNative
2 changes: 1 addition & 1 deletion vnext/Microsoft.ReactNative.Cxx.UnitTests/pch.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
#pragma once
#include <winrt/Windows.Foundation.Collections.h>
#include <winrt/Windows.Foundation.h>
#include "winrt/Microsoft.ReactNative.Bridge.h"
#include "winrt/Microsoft.ReactNative.h"
4 changes: 2 additions & 2 deletions vnext/Microsoft.ReactNative.Cxx/JSValue.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "pch.h"
#include "JSValue.h"

namespace winrt::Microsoft::ReactNative::Bridge {
namespace winrt::Microsoft::ReactNative {

//===========================================================================
// JSValue implementation
Expand Down Expand Up @@ -324,4 +324,4 @@ void swap(JSValue &left, JSValue &right) noexcept {
left = std::move(temp);
}

} // namespace winrt::Microsoft::ReactNative::Bridge
} // namespace winrt::Microsoft::ReactNative
Loading